diff --git a/gdm.spec b/gdm.spec
index cc51f1d..379a0de 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -17,7 +17,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.19.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -53,6 +53,9 @@ Patch33: gdm-2.19.1-pass-ats-to-session.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=457998
 Patch34: gdm-2.19.5-dont-warp-pointer-to-stylus.patch
 
+# make gdmsetup work with consolehelper
+Patch35: gdmsetup-path.patch
+
 Patch100: gdm-2.19.4-change-defaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -137,13 +140,14 @@ Extra icons / faces for the GNOME Display Manager.
 %patch32 -p1 -b .a11y-fixes
 %patch33 -p1 -b .pass-ats-to-session
 %patch34 -p1 -b .dont-warp-pointer-to-stylus
+%patch35 -p1 -b .gdmsetup-path
 
 %patch100 -p1 -b .change-defaults
 
 %build
 cp -f %{SOURCE1} config/gdm
 cp -f %{SOURCE2} config/gdm-autologin
-cp -f %{SOURCE3} gdmsetup-pam
+cp -f %{SOURCE3} utils/gdmsetup-pam
 
 intltoolize --force --copy
 aclocal
@@ -354,6 +358,9 @@ fi
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Sun Aug 12 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.19.5-7
+- Make gdmsetup work with consolehelper and pam again
+
 * Mon Aug  6 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.19.5-6
 - Require gnome-keyring-pam
 
diff --git a/gdmsetup-path.patch b/gdmsetup-path.patch
new file mode 100644
index 0000000..81a8645
--- /dev/null
+++ b/gdmsetup-path.patch
@@ -0,0 +1,14 @@
+diff -up gdm-2.19.5/gui/gdmsetup.desktop.in.in.gdmsetup-path gdm-2.19.5/gui/gdmsetup.desktop.in.in
+--- gdm-2.19.5/gui/gdmsetup.desktop.in.in.gdmsetup-path	2007-08-12 01:56:54.000000000 -0400
++++ gdm-2.19.5/gui/gdmsetup.desktop.in.in	2007-08-12 01:57:34.000000000 -0400
+@@ -2,8 +2,8 @@
+ Encoding=UTF-8
+ _Name=Login Window
+ _Comment=Configure GDM login window appearance and behavior
+-TryExec=@sbindir@/gdmsetup
+-Exec=@sbindir@/gdmsetup
++TryExec=@bindir@/gdmsetup
++Exec=@bindir@/gdmsetup
+ Icon=gdm-setup
+ StartupNotify=true
+ Terminal=false