diff --git a/srcpkgs/cinnamon-session/patches/remove_sessionmigration.patch b/srcpkgs/cinnamon-session/patches/remove_sessionmigration.patch
new file mode 100644
index 00000000000..58479c506ad
--- /dev/null
+++ b/srcpkgs/cinnamon-session/patches/remove_sessionmigration.patch
@@ -0,0 +1,18 @@
+--- cinnamon-session/csm-session-fill.c
++++ cinnamon-session/csm-session-fill.c
+@@ -228,15 +228,6 @@
+ load_standard_apps (CsmManager *manager,
+                     GKeyFile   *keyfile)
+ {
+-        GError *error;
+-
+-        g_debug ("fill: *** Executing user migration");
+-        error = NULL;
+-        if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) {
+-                 g_warning ("Error while executing session-migration: %s", error->message);
+-                 g_error_free (error);
+-        }
+-
+         g_debug ("fill: *** Adding required components");
+         handle_required_components (keyfile, !csm_manager_get_failsafe (manager),
+                                     append_required_components_helper, manager);
diff --git a/srcpkgs/cinnamon-session/patches/timeout.patch b/srcpkgs/cinnamon-session/patches/timeout.patch
new file mode 100644
index 00000000000..ed3cf6add65
--- /dev/null
+++ b/srcpkgs/cinnamon-session/patches/timeout.patch
@@ -0,0 +1,22 @@
+--- cinnamon-session/csm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
++++ cinnamon-session/csm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
+@@ -36,7 +36,7 @@
+ #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
+ 
+ /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
+-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
++#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
+ 
+ typedef void (*GsmFillHandleProvider) (const char *provides,
+                                        const char *default_provider,
+--- tools/cinnamon-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
++++ tools/cinnamon-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
+@@ -30,7 +30,7 @@
+ #include <X11/Xatom.h>
+ 
+ /* Wait up to this long for a running check to finish */
+-#define PROPERTY_CHANGE_TIMEOUT 5000
++#define PROPERTY_CHANGE_TIMEOUT 12000
+ 
+ /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
+ #define NO_ACCEL            0
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
new file mode 100644
index 00000000000..ee4a3cc4a84
--- /dev/null
+++ b/srcpkgs/cinnamon-session/template
@@ -0,0 +1,31 @@
+# Template file for 'cinnamon-session'
+pkgname=cinnamon-session
+version=2.0.6
+revision=1
+short_desc="The Cinnamon session handler"
+build_style=gnu-configure
+configure_args=" --disable-static --disable-schemas-compile
+ --enable-systemd --disable-gconf"
+hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
+ gettext-devel intltool which"
+makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel
+ systemd-devel pangox-compat-devel cinnamon-desktop-devel desktop-file-utils
+ hicolor-icon-theme"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-3"
+homepage="http://cinnamon.linuxmint.com/"
+
+do_fetch() {
+	git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
+}
+
+pre_configure() {
+	./autogen.sh
+}
+
+cinnamon-session_package() {
+	depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove all
+	}
+}