diff --git a/gdm-launch-environment.pamd b/gdm-launch-environment.pamd
index 4c05251..e72f6a1 100644
--- a/gdm-launch-environment.pamd
+++ b/gdm-launch-environment.pamd
@@ -3,5 +3,4 @@
 auth     required       pam_permit.so
 account  required       pam_permit.so
 password include        common-password
-session  required       pam_loginuid.so
 session  include        common-session
diff --git a/gdm.changes b/gdm.changes
index 9fd06f7..420ff75 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May 28 11:26:21 UTC 2014 - fcrozat@suse.com
+
+- Remove scrollkeeper configure flag, no longer exists.
+- Only build ConsoleKit support when not building systemd support.
+- Update gdm-launch-environment.pamd to not call pam_loginuid, it
+  was causing gdm logind session to not be detected as a greeter
+  session.
+
 -------------------------------------------------------------------
 Sat May 17 07:40:40 UTC 2014 - zaitor@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index d473086..c5ad50a 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -201,7 +201,6 @@ NOCONFIGURE=1 sh autogen.sh
         --libexecdir=%{_prefix}/lib/gdm \
         --localstatedir=%{_localstatedir} \
         --with-at-spi-registryd-directory=%{_libexecdir}/at-spi \
-        --with-consolekit-directory=%{_libexecdir}/ConsoleKit \
         --with-check-accelerated-directory=%{_libexecdir} \
         --with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon-3.0 \
         --enable-ipv6 \
@@ -209,15 +208,15 @@ NOCONFIGURE=1 sh autogen.sh
 %if %{with_systemd}
         --with-systemd \
 %else
+        --with-consolekit-directory=%{_libexecdir}/ConsoleKit \
         --without-systemd \
-%endif
         --with-console-kit \
+%endif
 %if %{enable_split_authentication}
         --enable-split-authentication \
 %else
         --disable-split-authentication \
 %endif
-        --disable-scrollkeeper \
         --with-initial-vt=7 \
         --with-run-dir=/run/gdm
 %__make %{?jobs:-j%jobs} V=1