diff -Nru mousepad-0.4.0/debian/changelog mousepad-0.4.0/debian/changelog
--- mousepad-0.4.0/debian/changelog 2015-03-01 12:02:18.000000000 +1100
+++ mousepad-0.4.0/debian/changelog 2015-05-22 08:01:25.000000000 +1000
@@ -1,3 +1,40 @@
+mousepad (0.4.0-2ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Switch to gtk3
+
+ -- Ubuntu Merge-o-Matic <mom@ubuntu.com>  Thu, 07 May 2015 05:32:01 +0000
+
+mousepad (0.4.0-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 06 May 2015 18:09:03 +0200
+
+mousepad (0.4.0-1) experimental; urgency=low
+
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org
+
+  [ Jackson Doak ]
+  * Bump standards version to 3.9.4
+  * Update manpage
+  * debian/rules: Add disable-silent-rules
+
+  [ Mateusz Łukasik ]
+  * New upstream release.
+  * Bump standards version to 3.9.6
+  * Switch from libdbus-glib-1-dev to libglib2.0-dev, glib 1 is no-longer used
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - add build-dep on xdt-autogen and dh-autoreconf
+  * debian/rules:
+    - use dh-autoreconf addon to refresh config.{guess,sub}.
+    - fix call to dh_auto_configure.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 15 Mar 2015 15:44:06 +0100
+
 mousepad (0.4.0-0ubuntu1) vivid; urgency=medium

   * New upstream release. LP: #1424887
diff -Nru mousepad-0.4.0/debian/control mousepad-0.4.0/debian/control
--- mousepad-0.4.0/debian/control   2015-03-01 12:04:40.000000000 +1100
+++ mousepad-0.4.0/debian/control   2015-05-22 08:03:44.000000000 +1000
@@ -6,10 +6,10 @@
 Uploaders: Emanuele Rocca <ema@debian.org>, Simon Huggins <huggie@earth.li>,
  Yves-Alexis Perez <corsac@debian.org>
 Build-Depends: debhelper (>= 9), pkg-config, libxml-parser-perl, intltool,
- libgtksourceview-3.0-dev, libdbus-glib-1-dev
-Standards-Version: 3.9.3
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/mousepad/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/
+ libgtksourceview-3.0-dev, libglib2.0-dev, xfce4-dev-tools, dh-autoreconf
+Standards-Version: 3.9.6
+Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/mousepad/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/mousepad/

 Package: mousepad
 Section: xfce
diff -Nru mousepad-0.4.0/debian/mousepad.1 mousepad-0.4.0/debian/mousepad.1
--- mousepad-0.4.0/debian/mousepad.1    2011-04-20 01:42:58.000000000 +1000
+++ mousepad-0.4.0/debian/mousepad.1    2015-05-07 15:32:01.000000000 +1000
@@ -1,4 +1,4 @@
-.TH "MOUSEPAD" "1"
+.TH MOUSEPAD "1" "September 2013" "Mousepad 0.3.0" "User Commands"
 .SH "NAME"
 mousepad \(em simple text editor for Xfce
 .SH "SYNOPSIS"
@@ -12,6 +12,58 @@
 .PP
 \fBmousepad\fR is a simple text
 editor for the Xfce Desktop Environment.
+.SS "Usage:"
+.IP
+mousepad [OPTION...] [FILES...]
+.SS "Help Options:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show help options
+.TP
+\fB\-\-help\-all\fR
+Show all help options
+.TP
+\fB\-\-help\-gtk\fR
+Show GTK+ Options
+.PP
+GTK+ Options
+.TP
+\fB\-\-class\fR=\fICLASS\fR
+Program class as used by the window manager
+.TP
+\fB\-\-name\fR=\fINAME\fR
+Program name as used by the window manager
+.TP
+\fB\-\-screen\fR=\fISCREEN\fR
+X screen to use
+.TP
+\fB\-\-sync\fR
+Make X calls synchronous
+.TP
+\fB\-\-gtk\-module\fR=\fIMODULES\fR
+Load additional GTK+ modules
+.TP
+\fB\-\-g\-fatal\-warnings\fR
+Make all warnings fatal
+.SS "Application Options:"
+.TP
+\fB\-\-disable\-server\fR
+Do not register with the D\-BUS session message bus
+.TP
+\fB\-q\fR, \fB\-\-quit\fR
+Quit a running Mousepad instance
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print version information and exit
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+X display to use
+.SH COPYRIGHT
+Copyright \(co 2007
+.IP
+The Xfce development team. All rights reserved.
+.PP
+Please report bugs to <http://bugzilla.xfce.org/>.

 .SH "SEE ALSO"
 .PP
@@ -26,6 +78,6 @@

 .PP
 On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL.
+License can be found in /usr/share/common-licenses/GPL-2.

 .\" created by instant / docbook-to-man, Tue 19 Apr 2011, 17:31
diff -Nru mousepad-0.4.0/debian/rules mousepad-0.4.0/debian/rules
--- mousepad-0.4.0/debian/rules 2015-03-01 12:03:43.000000000 +1100
+++ mousepad-0.4.0/debian/rules 2015-05-22 08:04:09.000000000 +1000
@@ -10,7 +10,11 @@
    dh_install --fail-missing

 override_dh_auto_configure:
-   dh_auto_configure -- --enable-gtk3
+   dh_auto_configure -- --disable-silent-rules --enable-gtk3
+
+override_dh_autoreconf:
+   mkdir -p m4
+   NOCONFIGURE=1 dh_autoreconf xdt-autogen

 %:
-   dh $@ --parallel
+   dh $@ --parallel --with autoreconf