diff -u libxcomposite-0.4.4/debian/control libxcomposite-0.4.4/debian/control
--- libxcomposite-0.4.4/debian/control
+++ libxcomposite-0.4.4/debian/control
@@ -64,6 +64,7 @@
 Package: libxcomposite-dev
 Architecture: any
 Section: libdevel
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxcomposite1 (= ${binary:Version}), libx11-dev, libxfixes-dev, x11proto-composite-dev (>= 1:0.4), x11proto-core-dev, libxext-dev
 Description: X11 Composite extension library (development headers)
  libXcomposite provides an X Window System client interface to the Composite
diff -u libxcomposite-0.4.4/debian/changelog libxcomposite-0.4.4/debian/changelog
--- libxcomposite-0.4.4/debian/changelog
+++ libxcomposite-0.4.4/debian/changelog
@@ -1,3 +1,11 @@
+libxcomposite (1:0.4.4-2) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Mark libxcomposite-dev as Multi-Arch: same (closes: #689082).  Hopefully
+    the docbook-generated manpage won't be too unpredictable. (LP: #1657385)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 20 Jan 2017 07:36:39 +0200
+
 libxcomposite (1:0.4.4-1) unstable; urgency=low
 
   * New upstream release.