diff --git a/srcpkgs/gdm/REMOVE b/srcpkgs/gdm/REMOVE
index a74b0357dae..c1033b98953 100644
--- a/srcpkgs/gdm/REMOVE
+++ b/srcpkgs/gdm/REMOVE
@@ -1,8 +1,8 @@
 #
-# This script removes leftovers dirs.
+# This script removes leftovers dirs at purge time.
 #
 case "${ACTION}" in
-post)
+purge)
 	[ -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
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index f043c7c5c59..1820875a16e 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,11 +1,12 @@
 # Template file for 'gdm'
 pkgname=gdm
 version=3.0.4
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/3.0/$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"
+--with-gconf-schema-file-dir=/usr/share/gconf/schemas --localstatedir=/var
+--with-at-spi-registryd-directory=/usr/libexec"
 short_desc="GNOME Display Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -61,6 +62,7 @@ Add_dependency run tcp_wrappers-libs
 Add_dependency run libcanberra
 Add_dependency run libXrandr
 Add_dependency run libxklavier
+Add_dependency run at-spi2-core
 
 Add_dependency build pkg-config
 Add_dependency build intltool
@@ -75,6 +77,7 @@ Add_dependency build tcp_wrappers-devel
 Add_dependency build libcanberra-devel
 Add_dependency build libXrandr-devel
 Add_dependency build libxklavier-devel
+Add_dependency build at-spi2-core-devel
 
 Add_dependency full ConsoleKit-x11
 Add_dependency full xorg-server
@@ -83,14 +86,11 @@ Add_dependency full polkit-gnome
 
 pre_configure()
 {
-	# Transform ${exec_prefix} to start at-spi-registryd!
 	# Make it use at-spi2-registryd, at-spi-registryd is from gnome2.
-	sed -i -e "s|\${exec_prefix}|/usr|" \
-		-e "s|at-spi-registryd|at-spi2-registryd|g" \
-		data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
 	sed -i -e "s|at-spi-registryd|at-spi2-registryd|g" \
 		gui/simple-chooser/gdm-host-chooser.c \
-		gui/simple-chooser/chooser-main.c
+		gui/simple-chooser/chooser-main.c \
+		data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
 }
 
 post_install()