diff --git a/abuild.patch b/abuild.patch
new file mode 100644
index 0000000..7780f1d
--- /dev/null
+++ b/abuild.patch
@@ -0,0 +1,13 @@
+Index: gdm-2.20.0/daemon/gdm.c
+===================================================================
+--- gdm-2.20.0.orig/daemon/gdm.c
++++ gdm-2.20.0/daemon/gdm.c
+@@ -623,7 +623,7 @@ try_command (const char *command)
+ 			}
+ 		}
+ 		else if (WIFSIGNALED (status)) {
+-			gdm_error ("Command '%s' was killed by signal '%s'"), command, g_strsignal (WTERMSIG (status));
++			gdm_error ("Command '%s' was killed by signal '%s'", command, g_strsignal (WTERMSIG (status)));
+ 			res = FALSE;
+ 		}
+ 	}
diff --git a/dbus-gdm.conf b/dbus-gdm.conf
new file mode 100644
index 0000000..0bfd141
--- /dev/null
+++ b/dbus-gdm.conf
@@ -0,0 +1,21 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <policy user="gdm">
+    <allow send_interface="org.freedesktop.ConsoleKit.Manager"/>
+    <allow send_interface="org.freedesktop.ConsoleKit.Seat"/>
+    <allow send_interface="org.freedesktop.ConsoleKit.Session"/>
+
+    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="OpenConsoleWithParameters"/>
+    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="Lock"/>
+    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="Unlock"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.DBus.Properties" />
+  </policy>
+
+</busconfig>
diff --git a/gdm.changes b/gdm.changes
index e8649ab..60cc796 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 18 17:02:46 CEST 2007 - maw@suse.de
+
+- Install dbus-gdm.conf to /etc/dbus-1/system.d (#331725)
+- Add abuild.patch.
+
 -------------------------------------------------------------------
 Thu Oct 11 16:39:37 CEST 2007 - sbrabec@suse.cz
 
diff --git a/gdm.spec b/gdm.spec
index a9b38e9..0752db9 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -22,7 +22,7 @@ PreReq:         %insserv_prereq
 License:        GPL v2 or later
 Group:          System/GUI/GNOME
 Version:        2.20.0
-Release:        14
+Release:        19
 Summary:        The GNOME 2.x Display Manager
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gdm.pamd
@@ -30,6 +30,7 @@ Source2:        gdm-autologin.pamd
 # FIXME: See FIXME in the script.
 Source3:        SuSEconfig.gdm
 Source5:        sysconfig.displaymanager-gdm
+Source6:        dbus-gdm.conf
 Patch0:         gdm-conf.patch
 Patch3:         gdm-language-dialog-size.patch
 Patch5:         gdm-xdm-sessions.patch
@@ -58,6 +59,8 @@ Patch40:        gdm-XKeepsCrashing-SaX2.patch
 Patch43:        gdm-language-hang.patch
 Patch44:        gdm-language-save.patch
 Patch45:        gdm-2.20.0-wait-for-restart.patch
+# PATCH-FIX-UPSTREAM abuild.patch maw@novell.com -- already fixed in gdm trunk, will go away when we upgrade to 2.21
+Patch46:        abuild.patch
 Url:            http://www.gnome.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 DocDir:         %{_defaultdocdir}
@@ -116,6 +119,7 @@ gnome-patch-translation-prepare
 %patch43
 %patch44
 %patch45 -p1
+%patch46 -p1
 gnome-patch-translation-update
 
 %build
@@ -150,6 +154,11 @@ chmod +x $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.gdm
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 cp %{S:5} $RPM_BUILD_ROOT/var/adm/fillup-templates
 %endif
+# 
+%if %suse_version > 1030
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d
+cp %{S:6} $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/gdm.conf
+%endif
 touch $RPM_BUILD_ROOT%{_sysconfdir}/gdm/gdm_sysconfig.conf
 # gnome.desktop should be in gnome-session, ssh.desktop doesn't work
 rm $RPM_BUILD_ROOT%{_datadir}/xsessions/ssh.desktop
@@ -245,9 +254,15 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 %if %suse_version <= 1020
 %dir /usr/share/xsessions
 %endif
+%if %suse_version > 1030
+%{_sysconfdir}/dbus-1/system.d/gdm.conf
+%endif
 
 %files lang -f %{name}.lang
 %changelog
+* Thu Oct 18 2007 - maw@suse.de
+- Install dbus-gdm.conf to /etc/dbus-1/system.d (#331725)
+- Add abuild.patch.
 * Thu Oct 11 2007 - sbrabec@suse.cz
 - Removed bogus dependency on mDNSResponder.
 * Mon Sep 24 2007 - hpj@suse.de