diff --git a/libxklavier-216201-kbd-layout-fix.patch b/libxklavier-216201-kbd-layout-fix.patch
deleted file mode 100644
index d20d58c..0000000
--- a/libxklavier-216201-kbd-layout-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxklavier/xklavier_config.c
-+++ libxklavier/xklavier_config.c
-@@ -261,7 +261,7 @@
- 		return FALSE;
- 
- 	nodes = xpath_obj->nodesetval;
--	if (nodes != NULL && nodes->nodeTab != NULL) {
-+	if (nodes != NULL && nodes->nodeTab != NULL && nodes->nodeNr > 0) {
- 		rv = xkl_read_config_item(config, *nodes->nodeTab, pitem);
- 		if (pnode != NULL) {
- 			*pnode = *nodes->nodeTab;
diff --git a/libxklavier-3.0.tar.bz2 b/libxklavier-3.0.tar.bz2
deleted file mode 100644
index 709f821..0000000
--- a/libxklavier-3.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12a6d1b5fd3f901b0fe47a913b5c541642521c72d038d3806562b12bafdbfdc6
-size 328873
diff --git a/libxklavier-3.2.tar.bz2 b/libxklavier-3.2.tar.bz2
new file mode 100644
index 0000000..f7f00fa
--- /dev/null
+++ b/libxklavier-3.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f4f65dd87fb982ed157fcec5184d62de134847b7cc8704f1851fa8807e14441
+size 334681
diff --git a/libxklavier.changes b/libxklavier.changes
index 654be0c..8a57e22 100644
--- a/libxklavier.changes
+++ b/libxklavier.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jul  6 20:14:55 CEST 2007 - maw@suse.de
+
+- Update to version 3.2
+- Bugfixes
+- Remove upstreamed libxklavier-216201-kbd-layout-fix.patch.
+
 -------------------------------------------------------------------
 Mon Mar  5 19:25:36 CET 2007 - danw@suse.de
 
diff --git a/libxklavier.spec b/libxklavier.spec
index dfe8271..53e4faa 100644
--- a/libxklavier.spec
+++ b/libxklavier.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libxklavier (Version 3.0)
+# spec file for package libxklavier (Version 3.2)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,14 +12,13 @@
 
 Name:           libxklavier
 BuildRequires:  doxygen glib2-devel gtk-doc libxml2-devel pkg-config xorg-x11-devel
-License:        GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License:        GPL v2 or later, LGPL v2 or later
 Group:          Development/Libraries/X11
 Autoreqprov:    on
-Version:        3.0
-Release:        40
+Version:        3.2
+Release:        1
 Summary:        Library with X Keyboard Related Functions
 Source:         %{name}-%{version}.tar.bz2
-Patch:          libxklavier-216201-kbd-layout-fix.patch
 URL:            http://www.freedesktop.org/Software/LibXklavier
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -63,7 +62,6 @@ Authors:
 
 %prep
 %setup -q
-%patch
 
 %build
 # needed for libxklavier-3.0 and openSUSE 10.2:
@@ -104,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libxklavier
 
 %changelog
+* Fri Jul 06 2007 - maw@suse.de
+- Update to version 3.2
+- Bugfixes
+- Remove upstreamed libxklavier-216201-kbd-layout-fix.patch.
 * Mon Mar 05 2007 - danw@suse.de
 - Add back --with-xkb-base that got removed in the spec file
   cleanup. #250556