diff --git a/gnome-settings-daemon-bnc369263-broken-xkb-layout.patch b/gnome-settings-daemon-bnc369263-broken-xkb-layout.patch
new file mode 100644
index 0000000..016d5e9
--- /dev/null
+++ b/gnome-settings-daemon-bnc369263-broken-xkb-layout.patch
@@ -0,0 +1,29 @@
+This is really only a workaround to unbreak things on startup. We need more
+time to investigate what the real fix is, and we don't have enough time for
+openSUSE 11.0.
+
+Index: gnome-settings-daemon-2.22.1/plugins/keyboard/gsd-keyboard-manager.c
+===================================================================
+--- gnome-settings-daemon-2.22.1.orig/plugins/keyboard/gsd-keyboard-manager.c
++++ gnome-settings-daemon-2.22.1/plugins/keyboard/gsd-keyboard-manager.c
+@@ -410,6 +410,7 @@ gsd_keyboard_manager_start (GsdKeyboardM
+                             GError            **error)
+ {
+         GConfClient *client;
++	char *program;
+ 
+         gnome_settings_profile_start (NULL);
+ 
+@@ -430,6 +431,12 @@ gsd_keyboard_manager_start (GsdKeyboardM
+         apply_settings (client, 0, NULL, manager);
+         g_object_unref (client);
+ 
++	program = g_find_program_in_path ("setxkbmap");
++	if (program != NULL) {
++		g_spawn_command_line_async (program, NULL);
++		g_free (program);
++	}
++
+         gnome_settings_profile_end (NULL);
+ 
+         return TRUE;
diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes
index 712d997..a053709 100644
--- a/gnome-settings-daemon.changes
+++ b/gnome-settings-daemon.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon May 26 17:10:43 CEST 2008 - vuntz@suse.de
+
+- Add gnome-settings-daemon-bnc369263-broken-xkb-layout.patch to
+  unbreak corrupted keymaps on automatic login. This is only a
+  workaround for openSUSE 11.0, unfortunately, since nobody found
+  the right fix yet. Fix bnc#369263. 
+
 -------------------------------------------------------------------
 Tue May  6 12:59:34 CEST 2008 - rodrigo@suse.de
 
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 6584d27..de6de5b 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -17,13 +17,15 @@ BuildRequires:  fdupes gnome-common gnome-desktop-devel gnome-patch-translation
 License:        GPL v2 or later
 Group:          System/GUI/GNOME
 Version:        2.22.1
-Release:        13
+Release:        19
 Summary:        Settings daemon for the GNOME desktop
 Source:         %{_name}-%{version}.tar.bz2
 # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.patch
 Patch2:         %{name}-system-proxy-configuration.patch
 # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-1.2.diff -- Add support for RandR 1.2 to the daemon. federico@novell.com
 Patch3:         gnome-settings-daemon-randr-1.2.diff
+# PATCH-FIX-UPSTREAM gnome-settings-daemon-bnc369263-broken-xkb-layout.patch bnc369263 bfo16105 vuntz@novell.com -- This is a hack to fix a major bug.
+Patch4:         gnome-settings-daemon-bnc369263-broken-xkb-layout.patch
 Url:            http://www.gnome.org
 Requires:       %{name}-lang = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -79,6 +81,7 @@ Authors:
 #gnome-patch-translation-prepare
 %patch2
 %patch3 -p1
+%patch4 -p1
 #gnome-patch-translation-update
 
 %build
@@ -130,6 +133,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon May 26 2008 vuntz@suse.de
+- Add gnome-settings-daemon-bnc369263-broken-xkb-layout.patch to
+  unbreak corrupted keymaps on automatic login. This is only a
+  workaround for openSUSE 11.0, unfortunately, since nobody found
+  the right fix yet. Fix bnc#369263.
 * Tue May 06 2008 rodrigo@suse.de
 - Updated gnome-settings-daemon-system-proxy-configuration.patch
   to add a missing return in non-void function