diff -u wmtop-0.84/debian/changelog wmtop-0.84/debian/changelog
--- wmtop-0.84/debian/changelog
+++ wmtop-0.84/debian/changelog
@@ -1,3 +1,11 @@
+wmtop (0.84-7ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable (LP: #136460). Remaining Ubuntu changes:
+    - Add libxext-dev Build-Depends
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Cesare Tirabassi <cesare.tirabassi@gmail.com>  Fri, 31 Aug 2007 21:41:26 +0200
+
 wmtop (0.84-7) unstable; urgency=low
 
   * comment strip of binary from upstream Makefile and debian/rules
@@ -9,6 +17,13 @@
 
  -- tony mancill <tmancill@debian.org>  Thu, 16 Aug 2007 22:46:37 -0700
 
+wmtop (0.84-6ubuntu1) edgy; urgency=low
+
+  * Re-sync with Debian
+  * Re-add libxext-dev build-dep (LaMont Jones)
+
+ -- Barry deFreese <bddebian@comcast.net>  Sat, 23 Sep 2006 00:13:07 -0400
+
 wmtop (0.84-6) unstable; urgency=low
 
   * debian/watch
diff -u wmtop-0.84/debian/control wmtop-0.84/debian/control
--- wmtop-0.84/debian/control
+++ wmtop-0.84/debian/control
@@ -1,9 +1,10 @@
 Source: wmtop
 Section: x11
 Priority: optional
-Maintainer: Sandro Tosi <matrixhasu@gmail.com>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sandro Tosi <matrixhasu@gmail.com>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 5), libx11-dev, libxpm-dev
+Build-Depends: debhelper (>= 5), libx11-dev, libxpm-dev, libxext-dev
 Standards-Version: 3.7.2
 
 Package: wmtop