diff -u libx11-1.6.3/debian/changelog libx11-1.6.3/debian/changelog
--- libx11-1.6.3/debian/changelog
+++ libx11-1.6.3/debian/changelog
@@ -1,3 +1,11 @@
+libx11 (2:1.6.3-1ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable. (LP: #1455797) Remaining changes:
+    - debian/control:
+      + Do not build the .txt files; w3m currently crashes on them.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Fri, 15 May 2015 20:15:04 +0200
+
 libx11 (2:1.6.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -14,6 +22,14 @@
 
  -- Cyril Brulebois <kibi@debian.org>  Mon, 18 Aug 2014 01:39:32 +0200
 
+libx11 (2:1.6.2-2ubuntu2) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Update symbols file for ppc64el.
+    - Do not build the .txt files; w3m currently crashes on them.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 04 Aug 2014 11:20:36 +0200
+
 libx11 (2:1.6.2-2) unstable; urgency=low
 
   [ Julien Cristau ]
@@ -27,6 +43,20 @@
 
  -- Julien Cristau <jcristau@debian.org>  Sun, 11 May 2014 18:04:23 +0200
 
+libx11 (2:1.6.2-1ubuntu2) trusty; urgency=low
+
+  * Update libx11 symbols file.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 04 Dec 2013 18:32:44 +0100
+
+libx11 (2:1.6.2-1ubuntu1) trusty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Do not build the .txt files; w3m currently crashes on them.
+    - Declare libx11-xcb-dev Multi-Arch: same.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 25 Oct 2013 17:45:51 +0100
+
 libx11 (2:1.6.2-1) unstable; urgency=low
 
   [ Julien Cristau ]
@@ -37,6 +67,18 @@
 
  -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 03 Oct 2013 09:46:46 +0200
 
+libx11 (2:1.6.1-1ubuntu2) trusty; urgency=low
+
+  * Declare libx11-xcb-dev Multi-Arch: same.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 23 Oct 2013 16:42:10 +0100
+
+libx11 (2:1.6.1-1ubuntu1) saucy; urgency=low
+
+  * Do not build the .txt files, w3m  currently crashes on them.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 02 Oct 2013 22:45:10 +0200
+
 libx11 (2:1.6.1-1) unstable; urgency=low
 
   [ Julien Cristau ]
diff -u libx11-1.6.3/debian/control libx11-1.6.3/debian/control
--- libx11-1.6.3/debian/control
+++ libx11-1.6.3/debian/control
@@ -1,7 +1,8 @@
 Source: libx11
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Build-Depends:
  debhelper (>= 7),
  dpkg-dev (>= 1.16.0),
@@ -20,7 +21,6 @@
 # specs
  xmlto,
  xorg-sgml-doctools (>= 1:1.10),
- w3m,
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libx11
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libx11.git