diff --git a/libgnomekbd-3.4.0.2.tar.xz b/libgnomekbd-3.4.0.2.tar.xz
deleted file mode 100644
index ae04c55..0000000
--- a/libgnomekbd-3.4.0.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e6c8956adbd39f1c3a8ec5c77bcf7ffbdaa54320398015d1174cd5003664e39
-size 368552
diff --git a/libgnomekbd-3.6.0.tar.xz b/libgnomekbd-3.6.0.tar.xz
new file mode 100644
index 0000000..752f737
--- /dev/null
+++ b/libgnomekbd-3.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09
+size 373588
diff --git a/libgnomekbd-default-group-switch.patch b/libgnomekbd-default-group-switch.patch
index a0546ca..0b0a881 100644
--- a/libgnomekbd-default-group-switch.patch
+++ b/libgnomekbd-default-group-switch.patch
@@ -1,7 +1,7 @@
-diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c
-index 51c6ce4..7c01781 100644
---- a/libgnomekbd/gkbd-keyboard-config.c
-+++ b/libgnomekbd/gkbd-keyboard-config.c
+Index: libgnomekbd-3.5.2/libgnomekbd/gkbd-keyboard-config.c
+===================================================================
+--- libgnomekbd-3.5.2.orig/libgnomekbd/gkbd-keyboard-config.c
++++ libgnomekbd-3.5.2/libgnomekbd/gkbd-keyboard-config.c
 @@ -35,7 +35,7 @@
   */
  
@@ -9,5 +9,5 @@ index 51c6ce4..7c01781 100644
 -#define DEFAULT_GROUP_SWITCH "grp:shift_caps_toggle"
 +#define DEFAULT_GROUP_SWITCH "grp:shifts_toggle"
  
- #define XMODMAP_CMD "xmodmap"
- 
+ const gchar GKBD_KEYBOARD_CONFIG_KEY_MODEL[] = "model";
+ const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[] = "layouts";
diff --git a/libgnomekbd.changes b/libgnomekbd.changes
index 0861fb3..c10410b 100644
--- a/libgnomekbd.changes
+++ b/libgnomekbd.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Sep 25 14:58:33 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.6.0:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sat Aug 25 13:30:49 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.90:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sun Jun 10 13:23:03 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.2:
+  + Removed xmodmap support, would be handled in g-s-d through the
+    scripts.
+  + Some minor build fixes.
+- Rebase libgnomekbd-default-group-switch.patch.
+
 -------------------------------------------------------------------
 Wed Mar 28 06:37:19 UTC 2012 - vuntz@opensuse.org
 
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index 2b74bcd..247ca1b 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -17,13 +17,13 @@
 
 
 Name:           libgnomekbd
-Version:        3.4.0.2
+Version:        3.6.0
 Release:        0
 Summary:        GNOME Keyboard Library
 License:        LGPL-2.1+
 Group:          System/GUI/GNOME
 Url:            http://www.gnome.org/
-Source:         http://download.gnome.org/sources/libgnomekbd/3.4/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/libgnomekbd/3.6/%{name}-%{version}.tar.xz
 # PATCH-FEATURE-OPENSUSE libgnomekbd-default-group-switch.patch vuntz@opensuse.org -- We use shifts_toggle to switch between groups in openSUSE
 Patch0:         libgnomekbd-default-group-switch.patch
 # For %%desktop_database_* macros