--- cinnamon-1.8.2.ebuild	2013-05-19 10:12:50.162676387 +0200
+++ cinnamon-1.8.5.ebuild	2013-05-23 12:12:05.526511136 +0200
@@ -125,7 +125,7 @@
 # libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
 # https://bugs.gentoo.org/show_bug.cgi?id=360413
 
-S="${WORKDIR}/linuxmint-Cinnamon-ded6f27"
+S="${WORKDIR}/linuxmint-Cinnamon-ce4dc6e"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -136,7 +136,9 @@
 	epatch "${FILESDIR}/${PN}-1.6.1-automagic-gnome-bluetooth.patch"
 
 	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${P}-optional-networkmanager.patch"
+	epatch "${FILESDIR}/cinnamon-1.8.2-optional-networkmanager.patch"
+
+	epatch "${FILESDIR}/cinnamon-1.8.5-screensaver-lock-dialog.patch"
 
 	# Gentoo uses /usr/libexec
 	sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \