diff --git a/srcpkgs/gdm/INSTALL b/srcpkgs/gdm/INSTALL
index f9b9fb6b469..3095cdcf763 100644
--- a/srcpkgs/gdm/INSTALL
+++ b/srcpkgs/gdm/INSTALL
@@ -3,7 +3,16 @@
 #
 case "${ACTION}" in
 post)
-	chown root:gdm var/lib/gdm
+	chmod 1770 var/gdm
+	chown root:gdm var/gdm
+	chmod 0711 var/run/gdm
+	chown root:gdm var/run/gdm
+	chmod 0755 var/run/gdm/greeter
+	chown gdm:gdm var/run/gdm/greeter
+	chmod 0755 var/lib/gdm/.config/dconf
+	chown gdm:gdm var/lib/gdm/.config/dconf
+	chmod 1755 var/cache/gdm
+	chown root:gdm /var/cache/gdm
 	chown -R root:gdm var/lib/gdm/.gconf.mandatory
 	;;
 esac
diff --git a/srcpkgs/gdm/REMOVE b/srcpkgs/gdm/REMOVE
index 1aeccc1025c..e30b2535fb7 100644
--- a/srcpkgs/gdm/REMOVE
+++ b/srcpkgs/gdm/REMOVE
@@ -3,11 +3,9 @@
 #
 case "${ACTION}" in
 post)
-	if [ -d var/lib/gdm ]; then
-		rm -rf var/lib/gdm
-	fi
-	if [ -d var/log/gdm ]; then
-		rm -rf var/log/gdm
-	fi
+	[ -d var/cache/gdm ] && rm -rf var/cache/gdm
+	[ -d var/lib/gdm ] && rm -rf var/lib/gdm
+	[ -d var/log/gdm ] && rm -rf var/log/gdm
+	[ -d var/gdm ] && rm -rf var/gdm
 	;;
 esac
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 59fca39a231..76c0ab34851 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,14 +1,12 @@
 # Template file for 'gdm'
 pkgname=gdm
 version=2.91.91
-patch_args="-Np1"
 distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var --enable-console-helper
---enable-authentication-scheme=pam --enable-ipv6
---with-user=gdm --with-group=gdm --with-xevie --exec-prefix=/usr"
+--localstatedir=/var --enable-ipv6 --with-user=gdm --with-group=gdm
+--with-xevie --exec-prefix=/usr"
 short_desc="GNOME Display Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=63925bf2bf2e6a6b619702db797fd40ba5fa395036a527d3566f3d41b9d9b90e
@@ -77,7 +75,6 @@ Add_dependency build libXdmcp-devel
 Add_dependency build tcp_wrappers-devel
 Add_dependency build libcanberra-devel
 
-Add_dependency full dbus-python
 Add_dependency full ConsoleKit-x11
 Add_dependency full xorg-server
 Add_dependency full hicolor-icon-theme