diff -u libxtst-1.2.0/debian/changelog libxtst-1.2.0/debian/changelog
--- libxtst-1.2.0/debian/changelog
+++ libxtst-1.2.0/debian/changelog
@@ -1,3 +1,15 @@
+libxtst (2:1.2.0-4) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Build for multiarch (closes: #639348).  Thanks, Peter Samuelson!
+  * Don't use dh_testroot in clean.
+
+  [ Steve Langasek ]
+  * Don't mark libxtst-dev Multi-Arch: same, because its documentation isn't
+    identical across architectures.
+
+ -- Steve Langasek <vorlon@debian.org>  Fri, 21 Oct 2011 20:17:23 -0700
+
 libxtst (2:1.2.0-3) unstable; urgency=low
 
   * Upload to unstable.
diff -u libxtst-1.2.0/debian/libxtst-dev.install libxtst-1.2.0/debian/libxtst-dev.install
--- libxtst-1.2.0/debian/libxtst-dev.install
+++ libxtst-1.2.0/debian/libxtst-dev.install
@@ -1,6 +1,6 @@
-usr/lib/libXtst.a
-usr/lib/libXtst.so
-usr/lib/pkgconfig/xtst.pc
+usr/lib/*/libXtst.a
+usr/lib/*/libXtst.so
+usr/lib/*/pkgconfig/xtst.pc
 usr/share/man/man3
 usr/include/X11/extensions/
 usr/share/doc/libxtst-dev/
diff -u libxtst-1.2.0/debian/control libxtst-1.2.0/debian/control
--- libxtst-1.2.0/debian/control
+++ libxtst-1.2.0/debian/control
@@ -4,6 +4,7 @@
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Cyril Brulebois <kibi@debian.org>
 Build-Depends:
+ dpkg-dev (>= 1.16),
  debhelper (>= 5.0.0),
  libx11-dev (>= 2:0.99.3),
  libxext-dev (>= 2:1.0.99.4),
@@ -26,6 +27,8 @@
 Package: libxtst6
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
 Description: X11 Testing -- Record extension library
  libXtst provides an X Window System client interface to the Record
@@ -50,6 +53,7 @@
 
 Package: libxtst6-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxtst6 (= ${binary:Version})
diff -u libxtst-1.2.0/debian/libxtst6-udeb.install libxtst-1.2.0/debian/libxtst6-udeb.install
--- libxtst-1.2.0/debian/libxtst6-udeb.install
+++ libxtst-1.2.0/debian/libxtst6-udeb.install
@@ -1 +1 @@
-usr/lib/libXtst.so.6*
+usr/lib/*/libXtst.so.6* usr/lib
diff -u libxtst-1.2.0/debian/rules libxtst-1.2.0/debian/rules
--- libxtst-1.2.0/debian/rules
+++ libxtst-1.2.0/debian/rules
@@ -26,6 +26,7 @@
 DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	confflags += --build=$(DEB_HOST_GNU_TYPE)
 else
@@ -41,6 +42,7 @@
 	cd build && \
 	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 	             --infodir=\$${prefix}/share/info $(confflags) \
+	             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	             --docdir=\$${prefix}/share/doc/libxtst-dev \
 	             --with-xmlto --without-fop \
 	             CFLAGS="$(CFLAGS)" 
@@ -49,7 +51,6 @@
 
 clean: xsfclean
 	dh_testdir
-	dh_testroot
 	rm -f build-stamp
 
 	rm -f config.cache config.log config.status
@@ -81,7 +82,8 @@
 	dh_installchangelogs ChangeLog
 	dh_installman
 	dh_link
-	dh_strip --dbg-package=$(PACKAGE)-dbg
+	dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+	dh_strip -N$(PACKAGE)
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs --add-udeb=$(PACKAGE)-udeb
diff -u libxtst-1.2.0/debian/libxtst6.install libxtst-1.2.0/debian/libxtst6.install
--- libxtst-1.2.0/debian/libxtst6.install
+++ libxtst-1.2.0/debian/libxtst6.install
@@ -1 +1 @@
-usr/lib/libXtst.so.6*
+usr/lib/*/libXtst.so.6*