diff --git a/srcpkgs/gdm/INSTALL b/srcpkgs/gdm/INSTALL
index 3095cdcf763..587e4627229 100644
--- a/srcpkgs/gdm/INSTALL
+++ b/srcpkgs/gdm/INSTALL
@@ -3,16 +3,11 @@
 #
 case "${ACTION}" in
 post)
-	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
+	if [ ! -d var/log/gdm ]; then
+		mkdir -p var/log/gdm
+		chown root:gdm var/log/gdm
+	fi
+	chown gdm:gdm var/lib/gdm > /dev/null
+	chown -R gdm:gdm var/lib/gdm/.gconf.mandatory
 	;;
 esac
diff --git a/srcpkgs/gdm/REMOVE b/srcpkgs/gdm/REMOVE
index e30b2535fb7..a74b0357dae 100644
--- a/srcpkgs/gdm/REMOVE
+++ b/srcpkgs/gdm/REMOVE
@@ -6,6 +6,5 @@ post)
 	[ -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/files/gdm.rc b/srcpkgs/gdm/files/gdm.rc
index c291b218981..1ccd72fcb57 100644
--- a/srcpkgs/gdm/files/gdm.rc
+++ b/srcpkgs/gdm/files/gdm.rc
@@ -1,6 +1,6 @@
 #!/sbin/runscript
 
-command=/usr/sbin/gdm-binary
+command=/usr/sbin/gdm
 
 depend()
 {
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index a1aecbf9f81..c29b5b78dda 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -5,9 +5,7 @@ revision=1
 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-ipv6 --with-user=gdm --with-group=gdm
---with-xevie --exec-prefix=/usr"
+--with-gconf-schema-file-dir=/usr/share/gconf/schemas --localstatedir=/var"
 short_desc="GNOME Display Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=63925bf2bf2e6a6b619702db797fd40ba5fa395036a527d3566f3d41b9d9b90e
@@ -25,15 +23,20 @@ long_desc="
  xdmcp a little bit in places where I thought xdm was lacking (but is
  still compatible with xdm's xdmcp)."
 
-keep_empty_dirs=yes
-conf_files="/etc/gdm/custom.conf /etc/pam.d/gdm /etc/pam.d/gdm-autologin"
+conf_files="
+/etc/gdm/custom.conf
+/etc/gdm/Init/Default
+/etc/gdm/PreSession/Default
+/etc/gdm/PostSession/Default
+/etc/pam.d/gdm
+/etc/pam.d/gdm-autologin"
+
 gconf_schemas="gdm-simple-greeter.schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 # Create the 'gdm' system user/group.
 system_accounts="gdm"
 gdm_homedir="/var/lib/gdm"
-gdm_descr="GNOME Display Manager user"
 openrc_services="gdm default true"
 
 Add_dependency run glibc