diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 74f47fd8ad1..68a75a96aa1 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -2,7 +2,7 @@
 #
 pkgname=cinnamon
 version=2.2.16
-revision=3
+revision=4
 patch_args="-Np1"
 short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
 build_style=gnu-configure
@@ -28,8 +28,8 @@ do_fetch() {
 }
 
 pre_configure() {
-	# Fix required components
-	sed -i 's/cinnamon-fallback-mount-helper;/polkit-cinnamon-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
+	# Add polkit agent to required components
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
 
 	# fix for the python2 PAM module  
 	sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
@@ -44,9 +44,6 @@ pre_configure() {
 	sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
 		files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
 
-	# Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
-	sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings{,-users}.desktop
-
 	NOCONFIGURE=1 ./autogen.sh
 }