diff -u xkbsel-0.13/configure.ac xkbsel-0.13/configure.ac
--- xkbsel-0.13/configure.ac
+++ xkbsel-0.13/configure.ac
@@ -73,7 +73,7 @@
 AC_SUBST(x11xkbdir)
 
 dnl Modifications by Milan Zamazal <pdm@debian.org>
-XKBCOMP=/usr/X11R6/bin/xkbcomp
+XKBCOMP=/usr/bin/xkbcomp
 AC_SUBST(XKBCOMP)
 dnl End of modifications
 
diff -u xkbsel-0.13/debian/xkbsel.copyright xkbsel-0.13/debian/xkbsel.copyright
--- xkbsel-0.13/debian/xkbsel.copyright
+++ xkbsel-0.13/debian/xkbsel.copyright
@@ -1,6 +1,6 @@
 This package was debianized by Milan Zamazal <pdm@debian.org>.
 
-It was downloaded from http://www.penguin.cz/~stano/sk/xkbsel.html.
+It was downloaded from http://www.meduna.org/sw_xkbsel_en.html.
 
 Copyright:
 
diff -u xkbsel-0.13/debian/control xkbsel-0.13/debian/control
--- xkbsel-0.13/debian/control
+++ xkbsel-0.13/debian/control
@@ -1,7 +1,8 @@
 Source: xkbsel
 Section: x11
 Priority: optional
-Maintainer: Gregory Pomerantz <gmp@alumni.brown.edu>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Gregory Pomerantz <gmp@alumni.brown.edu>
 Build-Depends: debhelper, libxaw7-dev, xkb-data, libdb-dev (>= 4.6.19-1), libjpeg62-dev, libpng12-dev, libtiff4-dev, libungif4-dev, flex, gettext, libtool, orbit, texinfo
 Standards-Version: 3.7.2
 
@@ -15,7 +16,7 @@
  This package contains the xkbsel basic files and binaries, including the
  Athena keyboard switching applet.
  .
- Homepage: http://www.penguin.cz/~stano/sk/xkbsel.html
+ Homepage: http://www.meduna.org/sw_xkbsel_en.html
 
 Package: libxkbsel-dev
 Section: devel
diff -u xkbsel-0.13/debian/changelog xkbsel-0.13/debian/changelog
--- xkbsel-0.13/debian/changelog
+++ xkbsel-0.13/debian/changelog
@@ -1,3 +1,12 @@
+xkbsel (0.13-13.3ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #157542). Remaining Ubuntu changes:
+    - Run /usr/bin/xkbcomp instead of /usr/X11R6/bin/xkbcomp
+    - New homepage http://www.meduna.org/sw_xkbsel_en.html
+    - Update maintainer field in debian/control
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sun, 21 Oct 2007 21:41:38 +0200
+
 xkbsel (0.13-13.3) unstable; urgency=low
 
   * NMU
@@ -6,6 +15,19 @@
 
  -- Clint Adams <schizo@debian.org>  Sun, 07 Oct 2007 09:33:57 -0400
 
+xkbsel (0.13-13.2ubuntu2) gutsy; urgency=low
+
+  * Run /usr/bin/xkbcomp instead of /usr/X11R6/bin/xkbcomp (LP: 30950)
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sat, 16 Jun 2007 12:05:43 +0200
+
+xkbsel (0.13-13.2ubuntu1) feisty; urgency=low
+
+  * New homepage http://www.meduna.org/sw_xkbsel_en.html (LP: 59561)
+  * Update maintainer field in debian/control
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Tue, 27 Mar 2007 23:26:38 +0200
+
 xkbsel (0.13-13.2) unstable; urgency=low
 
   * NMU
diff -u xkbsel-0.13/debian/libxkbsel-dev.copyright xkbsel-0.13/debian/libxkbsel-dev.copyright
--- xkbsel-0.13/debian/libxkbsel-dev.copyright
+++ xkbsel-0.13/debian/libxkbsel-dev.copyright
@@ -1,6 +1,6 @@
 This package was debianized by Milan Zamazal <pdm@debian.org>.
 
-It was downloaded from http://www.penguin.cz/~stano/sk/xkbsel.html.
+It was downloaded from http://www.meduna.org/sw_xkbsel_en.html.
 
 Copyright: