diff -u openjpeg-1.3+dfsg/debian/libopenjpeg2.install openjpeg-1.3+dfsg/debian/libopenjpeg2.install
--- openjpeg-1.3+dfsg/debian/libopenjpeg2.install
+++ openjpeg-1.3+dfsg/debian/libopenjpeg2.install
@@ -1 +1,2 @@
-lib*.so* usr/lib/
+usr/lib/*/lib*.so.*
+usr/lib/*/lib*-*.so
diff -u openjpeg-1.3+dfsg/debian/libopenjpeg-dev.install openjpeg-1.3+dfsg/debian/libopenjpeg-dev.install
--- openjpeg-1.3+dfsg/debian/libopenjpeg-dev.install
+++ openjpeg-1.3+dfsg/debian/libopenjpeg-dev.install
@@ -1,2 +1,3 @@
-*.h usr/include/
-lib*.a usr/lib
+usr/include
+usr/lib/*/lib*.a
+usr/lib/*/libopenjpeg.so
diff -u openjpeg-1.3+dfsg/debian/control openjpeg-1.3+dfsg/debian/control
--- openjpeg-1.3+dfsg/debian/control
+++ openjpeg-1.3+dfsg/debian/control
@@ -3,7 +3,7 @@
 Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.debian.org>
 Uploaders: Robin Cornelius <robin.cornelius@gmail.com>, Cyril Brulebois <kibi@debian.org>
 Homepage: http://www.openjpeg.org
-Build-Depends: debhelper (>= 5), dpatch (>= 2), libtiff4-dev
+Build-Depends: debhelper (>= 5), dpatch (>= 2), libtiff4-dev, dpkg-dev (>= 1.16.0)
 Standards-Version: 3.7.3
 Section: libs
 Vcs-Browser: http://git.debian.org/?p=pkg-phototools/openjpeg.git
@@ -23,6 +23,8 @@
 Package: libopenjpeg2
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}
 Description: JPEG 2000 image compression/decompression library
  Libopenjpeg2 is a library for handling the JPEG 2000 image compression format.
@@ -30,6 +32,8 @@
 Package: libopenjpeg2-dbg
 Section: libdevel
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libopenjpeg2 (= ${binary:Version})
 Description: debug symbols for libopenjpeg2, a JPEG 2000 image library
  This package contains the debug symbols to match the runtime component of the
@@ -39,7 +43,8 @@
 Package: openjpeg-tools
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends}
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: command-line tools using the JPEG 2000 library
  This package provides with command-line tools allowing for conversions between
  several formats:
diff -u openjpeg-1.3+dfsg/debian/rules openjpeg-1.3+dfsg/debian/rules
--- openjpeg-1.3+dfsg/debian/rules
+++ openjpeg-1.3+dfsg/debian/rules
@@ -5,6 +5,8 @@
 # used as trailer in the generated manpages
 UVERSION = $(shell dpkg-parsechangelog | perl -ne 'print "$$1\n" if (/^Version: (.*?)(?:\.dfsg)?\-.*?$$/)')
 
+DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	EXTRA_CFLAGS += -O0
 else
@@ -59,7 +61,9 @@
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) dist
+	$(MAKE) install DESTDIR=dist INSTALL_LIBDIR=\$${PREFIX}/lib/$(DEB_HOST_MULTIARCH)
+	cd dist/usr/lib/$(DEB_HOST_MULTIARCH) && ln -s libopenjpeg.so.2 libopenjpeg.so
+
 	# The libraries and header file are in dist/
 	# So we'll dump the binaries there too
 	cp codec/j2k_to_image codec/image_to_j2k dist/
diff -u openjpeg-1.3+dfsg/debian/changelog openjpeg-1.3+dfsg/debian/changelog
--- openjpeg-1.3+dfsg/debian/changelog
+++ openjpeg-1.3+dfsg/debian/changelog
@@ -1,3 +1,10 @@
+openjpeg (1.3+dfsg-4.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Enable multiarch (closes: #675733).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Mon, 02 Jul 2012 16:13:27 -0400
+
 openjpeg (1.3+dfsg-4.1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team.
reverted:
--- openjpeg-1.3+dfsg/debian/libopenjpeg2.links
+++ openjpeg-1.3+dfsg.orig/debian/libopenjpeg2.links
@@ -1 +0,0 @@
-/usr/lib/libopenjpeg-2.1.3.0.so /usr/lib/libopenjpeg.so.2
reverted:
--- openjpeg-1.3+dfsg/debian/libopenjpeg-dev.links
+++ openjpeg-1.3+dfsg.orig/debian/libopenjpeg-dev.links
@@ -1 +0,0 @@
-/usr/lib/libopenjpeg.so.2 /usr/lib/libopenjpeg.so