diff --git a/.cvsignore b/.cvsignore
index 7c15fde..97e8a1b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libxklavier-3.6.tar.bz2
+libxklavier-3.7.tar.bz2
diff --git a/libxklavier.spec b/libxklavier.spec
index 6567574..aa236a1 100644
--- a/libxklavier.spec
+++ b/libxklavier.spec
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
-Version:	3.6
-Release: 	2%{?dist}
+Version:	3.7
+Release: 	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -12,11 +12,9 @@ BuildRequires: libX11-devel
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: iso-codes-devel
-Source: http://download.gnome.org/sources/libxklavier/3.6/libxklavier-3.6.tar.bz2
+Source: http://download.gnome.org/sources/libxklavier/3.7/libxklavier-3.7.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch0: libxklavier-2.1-vnc-bug.patch
-
 %description
 libxklavier is a library providing high-level API for X Keyboard Extension
 known as XKB. This library is intended to support XFree86 and other
@@ -36,7 +34,6 @@ Libraries, include files, etc you can use to develop libxklavier applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .vnc-bug
 
 %build
 
@@ -72,6 +69,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen <mclasen@redhat.com> - 3.7-1
+- Update to 3.7
+
 * Fri Jun 27 2008 Ray Strode <rstrode@redhat.com> - 3.6-2
 - Apply upstream patch to fix libxklavier crash (bug 452966)
 
diff --git a/sources b/sources
index e3de0f1..c7306dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eff30f70e4c082e2aa6a0fbecc15253b  libxklavier-3.6.tar.bz2
+ee167645becd11309d64c6ff3a1600ff  libxklavier-3.7.tar.bz2
diff --git a/vnc-bug.patch b/vnc-bug.patch
new file mode 100644
index 0000000..0c8ff24
--- /dev/null
+++ b/vnc-bug.patch
@@ -0,0 +1,15 @@
+diff -up libxklavier-3.6/libxklavier/xklavier_util.c.vnc-bug libxklavier-3.6/libxklavier/xklavier_util.c
+--- libxklavier-3.6/libxklavier/xklavier_util.c.vnc-bug	2008-03-01 16:42:49.000000000 -0500
++++ libxklavier-3.6/libxklavier/xklavier_util.c	2008-08-30 12:43:27.000000000 -0400
+@@ -118,7 +118,10 @@ xkl_get_debug_window_title(XklEngine * e
+ 	static gchar sname[33];
+ 	gchar *name;
+ 	strcpy(sname, "NULL");
+-	if (win != (Window) NULL) {
++
++	if (win == (Window *) PointerRoot) {
++		strcpy(sname, "ROOT");
++	} else if (win != (Window *) None) {
+ 		name = xkl_engine_get_window_title(engine, win);
+ 		if (name != NULL) {
+ 			snprintf(sname, sizeof(sname), "%.32s", name);