diff -Nru virtkey-0.50build1/debian/changelog virtkey-0.50ubuntu0.1/debian/changelog
--- virtkey-0.50build1/debian/changelog	2008-03-10 23:48:18.000000000 +1100
+++ virtkey-0.50ubuntu0.1/debian/changelog	2008-04-30 10:00:01.000000000 +1000
@@ -1,3 +1,15 @@
+virtkey (0.50ubuntu0.1) hardy-proposed; urgency=low
+
+  [ Chris Jones ]
+  * Work round broken xkb, see LP #220809. (LP: #220475)
+
+  [ Luke Yelavich ]
+  * Adjust version number for a stable release update.
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Luke Yelavich <luke.yelavich@canonical.com>  Wed, 30 Apr 2008 09:59:52 +1000
+
 virtkey (0.50build1) hardy; urgency=low
 
   * Rebuild with recent python-central.
diff -Nru /tmp/31V3piXXrr/virtkey-0.50build1/debian/control /tmp/RXrtYHcyMl/virtkey-0.50ubuntu0.1/debian/control
--- virtkey-0.50build1/debian/control	2008-02-19 12:41:14.000000000 +1100
+++ virtkey-0.50ubuntu0.1/debian/control	2008-04-30 09:59:50.000000000 +1000
@@ -2,7 +2,8 @@
 Section: python
 Priority: optional
 Build-Depends: debhelper, python-central, python-all-dev, python-all, libx11-dev, libxext-dev, libxtst-dev, cdbs, libgtk2.0-dev
-Maintainer: Chris Jones <cej105@soton.ac.uk>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Chris Jones <cej105@soton.ac.uk>
 Standards-Version: 3.7.2
 Homepage: https://launchpad.net/virtkey
 Vcs-Bzr: http://bazaar.launchpad.net/~onboard/virtkey/main/
diff -Nru /tmp/31V3piXXrr/virtkey-0.50build1/python-virtkey.c /tmp/RXrtYHcyMl/virtkey-0.50ubuntu0.1/python-virtkey.c
--- virtkey-0.50build1/python-virtkey.c	2008-02-19 12:41:14.000000000 +1100
+++ virtkey-0.50ubuntu0.1/python-virtkey.c	2008-04-30 09:40:23.000000000 +1000
@@ -138,7 +138,7 @@
 //Need to handle errors here properly.
 void getKbd(virtkey * cvirt){
 	cvirt->kbd = XkbGetKeyboard (cvirt->display,
-                                    XkbGBN_GeometryMask |
+                                    //XkbGBN_GeometryMask |
                                     XkbGBN_KeyNamesMask |
                                     XkbGBN_OtherNamesMask |
             				        XkbGBN_SymbolsMask |