diff --git a/gnome-control-center-bnc373197-layout-switch-keybinding.patch b/gnome-control-center-bnc373197-layout-switch-keybinding.patch
new file mode 100644
index 0000000..5848306
--- /dev/null
+++ b/gnome-control-center-bnc373197-layout-switch-keybinding.patch
@@ -0,0 +1,12 @@
+diff -aurp gnome-control-center-2.22.1/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c gnome-control-center-2.22.1-patched/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c
+--- gnome-control-center-2.22.1/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c	2008-03-27 14:12:29.000000000 +0100
++++ gnome-control-center-2.22.1-patched/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c	2008-05-13 10:33:19.480124000 +0200
+@@ -37,7 +37,7 @@
+ #include "gnome-keyboard-properties-xkb.h"
+ 
+ #define GROUP_SWITCHERS_GROUP "grp"
+-#define DEFAULT_GROUP_SWITCH "grp:alts_toggle"
++#define DEFAULT_GROUP_SWITCH "grp:shifts_toggle"
+ #define DEFAULT_VARIANT_ID "__default__"
+ 
+ enum {
diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index 93e536c..838d9b5 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue May 13 11:08:27 CEST 2008 - vuntz@suse.de
+
+- Add gnome-control-center-bnc373197-layout-switch-keybinding.patch
+  to change the default keyboard layout switching to
+  Shift_L+Shift_R instead of Alt_L+Alt_R, which doesn't work at the
+  moment. Helps with bnc#373197 for 11.0.
+
 -------------------------------------------------------------------
 Sat May  3 08:53:00 CEST 2008 - coolo@suse.de
 
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index f29ffb5..1440e97 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -19,7 +19,7 @@ Group:          System/GUI/GNOME
 Obsoletes:      fontilus themus acme
 Provides:       fontilus themus acme
 Version:        2.22.1
-Release:        14
+Release:        19
 Summary:        The GNOME Control Center
 Source:         gnome-%{_name}-%{version}.tar.bz2
 Source1:        control-center-art.tar.bz2
@@ -44,6 +44,8 @@ Requires:       gnome-icon-theme
 Patch28:        gnome-control-center-use-preferences-menu.patch
 # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-1.2.diff -- Add support for RandR 1.2 to gnome-display-properties. federico@novell.com
 Patch29:        gnome-control-center-randr-1.2.diff
+# PATCH-FIX-OPENSUSE gnome-control-center-bnc373197-layout-switch-keybinding.patch bnc373197 vuntz@novell.com -- this is a temporary hack to change the default layout switching keybinding
+Patch30:        gnome-control-center-bnc373197-layout-switch-keybinding.patch
 Url:            http://www.gnome.org
 Requires:       nautilus gnome-settings-daemon
 Requires:       %{name}-lang = %{version}
@@ -103,6 +105,7 @@ gnome-patch-translation-prepare
 cp %{S:3} capplets/passwd/change-password.png
 %patch28
 %patch29 -p1
+%patch30 -p1
 gnome-patch-translation-update
 
 %build
@@ -224,6 +227,11 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue May 13 2008 vuntz@suse.de
+- Add gnome-control-center-bnc373197-layout-switch-keybinding.patch
+  to change the default keyboard layout switching to
+  Shift_L+Shift_R instead of Alt_L+Alt_R, which doesn't work at the
+  moment. Helps with bnc#373197 for 11.0.
 * Sat May 03 2008 coolo@suse.de
 - Obsoleting older version not newer
 * Fri Apr 25 2008 federico@novell.com