diff -u matchbox-desktop-2.0/debian/control matchbox-desktop-2.0/debian/control
--- matchbox-desktop-2.0/debian/control
+++ matchbox-desktop-2.0/debian/control
@@ -1,8 +1,7 @@
 Source: matchbox-desktop
 Section: embedded
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Moray Allan <moray@debian.org>
+Maintainer: Moray Allan <moray@debian.org>
 Build-Depends: cdbs (>= 0.4.21), debhelper (>= 4.1.0), pkg-config, libstartup-notification0-dev, libmatchbox-dev (>= 1.7-4), libgtk2.0-dev
 Standards-Version: 3.6.2
 
diff -u matchbox-desktop-2.0/debian/changelog matchbox-desktop-2.0/debian/changelog
--- matchbox-desktop-2.0/debian/changelog
+++ matchbox-desktop-2.0/debian/changelog
@@ -1,10 +1,8 @@
-matchbox-desktop (2.0-1ubuntu1) natty; urgency=low
+matchbox-desktop (2.0-2) unstable; urgency=low
 
-  * Link X11 libraries during build in /src/Makefile.in and /src/Makefile.am 
-    to fix FTBFS with ld --no-add-needed LP: #692860 
-    ( Also closes debian bug #555587 )
+  * Add -lX11 to LDADD.  Closes: #555587.
 
- -- Bhavani Shankar <bhavi@ubuntu.com>  Tue, 28 Dec 2010 10:52:40 +0530
+ -- Moray Allan <moray@debian.org>  Sat, 07 May 2011 20:45:30 +0100
 
 matchbox-desktop (2.0-1) unstable; urgency=low