diff --git a/libgnomekbd-2.31.2.tar.bz2 b/libgnomekbd-2.31.2.tar.bz2
deleted file mode 100644
index 1ef8f31..0000000
--- a/libgnomekbd-2.31.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08636ff9f289e6dabe7994fadb03a550170a22182ba6a9586dc4e5710ee47e9d
-size 385882
diff --git a/libgnomekbd-2.31.5.tar.bz2 b/libgnomekbd-2.31.5.tar.bz2
new file mode 100644
index 0000000..21de302
--- /dev/null
+++ b/libgnomekbd-2.31.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a93b6af0f98e6754d6348a35f4059baa73067b8e7f87b6ddbc11aec990d04a8
+size 409510
diff --git a/libgnomekbd-default-group-switch.patch b/libgnomekbd-default-group-switch.patch
new file mode 100644
index 0000000..29a6cec
--- /dev/null
+++ b/libgnomekbd-default-group-switch.patch
@@ -0,0 +1,13 @@
+Index: libgnomekbd-2.31.5/libgnomekbd/gkbd-keyboard-config.c
+===================================================================
+--- libgnomekbd-2.31.5.orig/libgnomekbd/gkbd-keyboard-config.c
++++ libgnomekbd-2.31.5/libgnomekbd/gkbd-keyboard-config.c
+@@ -35,7 +35,7 @@
+ #define GKBD_KEYBOARD_CONFIG_KEY_PREFIX GKBD_CONFIG_KEY_PREFIX "/kbd"
+ 
+ #define GROUP_SWITCHERS_GROUP "grp"
+-#define DEFAULT_GROUP_SWITCH "grp:shift_caps_toggle"
++#define DEFAULT_GROUP_SWITCH "grp:shifts_toggle"
+ 
+ const gchar GKBD_KEYBOARD_CONFIG_DIR[] = GKBD_KEYBOARD_CONFIG_KEY_PREFIX;
+ const gchar GKBD_KEYBOARD_CONFIG_KEY_MODEL[] =
diff --git a/libgnomekbd-proper-notification-name.patch b/libgnomekbd-proper-notification-name.patch
deleted file mode 100644
index 3aa1be4..0000000
--- a/libgnomekbd-proper-notification-name.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 8dbeec103124f9de1ed515ef50ff79eff3ecd52c
-Author: Sergey V. Udaltsov <svu@gnome.org>
-Date:   Sun Apr 25 23:59:53 2010 +0100
-
-    Provide the proper place in NA by using the name
-    
-    The name "keyboard" is known to the NA applet - so it positions the icon
-    properly, on the right side, after all apps
-
-Index: libgnomekbd-2.31.2/libgnomekbd/gkbd-status.c
-===================================================================
---- libgnomekbd-2.31.2.orig/libgnomekbd/gkbd-status.c
-+++ libgnomekbd-2.31.2/libgnomekbd/gkbd-status.c
-@@ -635,6 +635,9 @@ gkbd_status_init (GkbdStatus * gki)
- 	/* This should give NA a hint about the order */
- 	gtk_status_icon_set_name (GTK_STATUS_ICON(gki), "keyboard");
- 
-+	/* This should give NA a hint about the order */
-+	gtk_status_icon_set_name (GTK_STATUS_ICON(gki), "keyboard");
-+
- 	xkl_debug (100, "Initiating the widget startup process for %p\n",
- 		   gki);
- 
diff --git a/libgnomekbd.changes b/libgnomekbd.changes
index b0ed543..35e4967 100644
--- a/libgnomekbd.changes
+++ b/libgnomekbd.changes
@@ -1,8 +1,20 @@
+-------------------------------------------------------------------
+Fri Aug  6 03:10:52 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.31.5:
+  + One crasher fixed
+  + Rendering improved
+  + Updated translations.
+- Add libgnomekbd-default-group-switch.patch to change the group
+  switch keybinding to shifts_toggle, since that's what we use in
+  openSUSE.
+
 -------------------------------------------------------------------
 Wed Jul 14 09:50:00 CEST 2010 - dimstar@opensuse.org
 
 - Update to version 2.31.2:
   + Seriously improved status icon rendering
+- Changes from version 2.31.1:
   + Several crashers fixed
   + Provided API for handling the default group switcher. Changed
     the default value to be "grp:shift_caps_toggle"
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index e717161..74b88be 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libgnomekbd (Version 2.31.2)
+# spec file for package libgnomekbd (Version 2.31.5)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,13 +18,15 @@
 
 
 Name:           libgnomekbd
-Version:        2.31.2
+Version:        2.31.5
 Release:        1
 License:        LGPLv2.1+
 Summary:        GNOME Keyboard Library
 Url:            http://www.gnome.org/
 Group:          System/GUI/GNOME
 Source:         %{name}-%{version}.tar.bz2
+# PATCH-FEATURE-OPENSUSE libgnomekbd-default-group-switch.patch vuntz@opensuse.org -- We use shifts_toggle to switch between groups in openSUSE. Keep in sync with gnome-control-center-bnc373197-layout-switch-keybinding.patch in gnome-control-center, and with gnome-settings-daemon-add-layout-switcher.patch in gnome-settings-daemon
+Patch0:         libgnomekbd-default-group-switch.patch
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
 BuildRequires:  gtk2-devel
@@ -56,6 +58,7 @@ GNOME keyboard library, utility and applet.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 
 %build
 %configure --disable-static --with-pic