diff --git a/pentoo/pentoo-cinnamon/Manifest b/pentoo/pentoo-cinnamon/Manifest
index 60990ac3c..b629fc4a4 100644
--- a/pentoo/pentoo-cinnamon/Manifest
+++ b/pentoo/pentoo-cinnamon/Manifest
@@ -1 +1 @@
-EBUILD pentoo-cinnamon-2012.0.ebuild 628 SHA256 2da883bdd30aa9ce2854cd12edf59a3b16665d31347bb73326ceafffe5a5713c SHA512 cf038e24fedd8993e5a85cfce09c8e122142a9501fded18f230e4cd692819b39a1caf34da359e2c9b0fef4b40ba9953a998be58862b49c985d1430ea202d94fc WHIRLPOOL 12f3e6fa7f6b333c6dd3d304c94caba638bfdbae84d67500ec5ff2b3ce2339bff6e4be3017d44d4d083a8a0835d045bf65c011b5ce748bd585505f0445328054
+EBUILD pentoo-cinnamon-2012.0.ebuild 627 SHA256 8eed5727e306fcc7da64d21e25914a3e1d8128dda3d9918c9560dafb7760de44 SHA512 12adaa599d69c19c1d22bee37ca963dbe6f4ca780224c9370cf2acf81fc9d58527a97c6515bacc161158c43ada488dcb2040478cb7ff6c292485f0fb5a305305 WHIRLPOOL bcbbaeba6421901ea0e5b1b584214ec4a9554ea8ca3a8dae4499cfb9ccf5dfc66c723ed652fcc52a1bc0a4119ced9aa1729cb89d8a8e5466e4525160bf0450f8
diff --git a/pentoo/pentoo-cinnamon/pentoo-cinnamon-2012.0.ebuild b/pentoo/pentoo-cinnamon/pentoo-cinnamon-2012.0.ebuild
index 3bbf43766..98e77c201 100644
--- a/pentoo/pentoo-cinnamon/pentoo-cinnamon-2012.0.ebuild
+++ b/pentoo/pentoo-cinnamon/pentoo-cinnamon-2012.0.ebuild
@@ -9,12 +9,12 @@ DESCRIPTION="Pentoo mobile meta ebuild"
 HOMEPAGE="http://www.pentoo.ch"
 SLOT="0"
 LICENSE="GPL-3"
-IUSE=""
+IUSE="gdm"
 
 DEPEND=""
 RDEPEND="${DEPEND}
 	gnome-extra/cinnamon
-	>=gnome-base/nautilus-3.4.2
+	gnome-extra/nemo
 	>=x11-themes/zukitwo-2012.07.02
 	>=x11-terms/gnome-terminal-3.4.0
 	>=media-gfx/gnome-screenshot-3.4.1
@@ -23,5 +23,4 @@ RDEPEND="${DEPEND}
 	>=gnome-extra/gcalctool-3.4.0
 	>=media-gfx/eog-3.4.0
 	>=app-text/evince-3.4.0
-	"
-#>=gnome-base/gdm-3.4.1
+	gdm? ( >=gnome-base/gdm-3.4.1 )"
diff --git a/profiles/pentoo/bleeding/package.accept_keywords/cinnamon b/profiles/pentoo/bleeding/package.accept_keywords/cinnamon
index 4ff96b828..4bd635158 100644
--- a/profiles/pentoo/bleeding/package.accept_keywords/cinnamon
+++ b/profiles/pentoo/bleeding/package.accept_keywords/cinnamon
@@ -1,3 +1,10 @@
+~gnome-extra/cinnamon-1.6.1
+~gnome-base/nautilus-3.4.2
+~gnome-extra/nemo-1.0.2
+~x11-wm/muffin-1.1.1
+
+=gnome-base/gdm-3.4.1-r1
+
 #theme
 x11-themes/zukitwo
 ~x11-libs/gdk-pixbuf-2.26.3
@@ -23,7 +30,6 @@ x11-themes/zukitwo
 ~dev-util/fix-la-relink-command-0.1.1
 ~gnome-base/dconf-0.12.1
 ~gnome-base/gconf-3.2.5
-~gnome-base/gdm-3.4.1
 ~gnome-base/gnome-control-center-3.4.2
 ~gnome-base/gnome-desktop-3.4.2
 ~gnome-base/gnome-keyring-3.4.1
@@ -35,7 +41,6 @@ x11-themes/zukitwo
 ~gnome-base/gsettings-desktop-schemas-3.4.2
 ~gnome-base/libgnome-keyring-3.4.1
 ~gnome-base/libgnomekbd-3.4.0.2
-~gnome-extra/cinnamon-1.6.0
 ~gnome-extra/evolution-data-server-3.4.4
 ~gnome-extra/evolution-data-server-3.4.4
 ~gnome-extra/gnome-color-manager-3.4.2
@@ -55,31 +60,25 @@ x11-themes/zukitwo
 ~x11-libs/gnome-pty-helper-0.32.2
 ~x11-libs/mx-1.4.7
 ~x11-libs/vte-0.32.2
-~x11-wm/muffin-1.1.0
 ~x11-wm/mutter-3.4.1-r1
 
 #additional software
+~x11-terms/gnome-terminal-3.4.1.1
+~media-gfx/gnome-screenshot-3.4.1
+~gnome-extra/gnome-screensaver-3.4.4
+~gnome-extra/gnome-system-monitor-3.4.1
+~dev-libs/vala-common-0.18.0
+~gnome-base/librsvg-2.36.3
 
 ~app-editors/gedit-3.4.2
 ~gnome-base/libgdu-3.0.2
 
-~x11-terms/gnome-terminal-3.4.1.1
-
 ~app-crypt/seahorse-3.4.1
 
 ~dev-util/meld-1.6.0
 
-~gnome-extra/gnome-system-monitor-3.4.1
-~dev-libs/vala-common-0.18.0
-~gnome-base/librsvg-2.36.3
-
 ~app-text/evince-3.4.0
 ~media-gfx/eog-3.4.3
 
-~gnome-extra/gnome-screensaver-3.4.4
-
 ~gnome-extra/sushi-0.4.1
 ~dev-util/gdbus-codegen-2.32.4
-~gnome-base/nautilus-3.4.2
-
-~media-gfx/gnome-screenshot-3.4.1