diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 1b8a6bc..eb494fb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
  , David Paleino <dapal@debian.org>
 Homepage: http://www.openjpeg.org
 Build-Depends:
- debhelper (>= 8)
+ debhelper (>= 9)
  , autotools-dev
  , libtiff5-dev
  , libpng-dev
@@ -24,6 +24,7 @@ Vcs-Git: git://git.debian.org/git/pkg-phototools/openjpeg.git
 Package: libopenjpeg-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends:
  libopenjpeg2 (= ${binary:Version})
  , ${misc:Depends}
@@ -36,6 +37,8 @@ Description: development files for libopenjpeg2, a JPEG 2000 image library
 
 Package: libopenjpeg2
 Architecture: any
+Multi-Arch: same
+Pre-Depends: multiarch-support
 Depends:
  ${shlibs:Depends}
  , ${misc:Depends}
@@ -44,6 +47,7 @@ Description: JPEG 2000 image compression/decompression library
 
 Package: libopenjpeg2-dbg
 Section: debug
+Multi-Arch: same
 Architecture: any
 Depends: libopenjpeg2 (= ${binary:Version}), ${misc:Depends}
 Description: debug symbols for libopenjpeg2, a JPEG 2000 image library
@@ -54,8 +58,10 @@ Description: debug symbols for libopenjpeg2, a JPEG 2000 image library
 Package: openjpeg-tools
 Section: graphics
 Architecture: any
+Multi-Arch: foreign
 Depends:
- ${shlibs:Depends}
+ libopenjpeg2
+ , ${shlibs:Depends}
  , ${misc:Depends}
 Description: command-line tools using the JPEG 2000 library
  This package provides with command-line tools allowing for conversions between
diff --git a/debian/libopenjpeg-dev.install b/debian/libopenjpeg-dev.install
index cb5b9b4..369a55d 100644
--- a/debian/libopenjpeg-dev.install
+++ b/debian/libopenjpeg-dev.install
@@ -1,3 +1,5 @@
 usr/include/openjpeg-1.5
-usr/lib/libopenjpeg.so
-
+usr/lib/*/libopenjpeg.so
+usr/lib/*/libopenjpeg_JPWL.so
+usr/lib/*/libopenjpip_local.so
+usr/lib/*/libopenjpip_server.so
diff --git a/debian/libopenjpeg-dev.links b/debian/libopenjpeg-dev.links
deleted file mode 100644
index 2320998..0000000
--- a/debian/libopenjpeg-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libopenjpeg.so.2 /usr/lib/libopenjpeg.so
diff --git a/debian/libopenjpeg-dev.links.in b/debian/libopenjpeg-dev.links.in
new file mode 100644
index 0000000..1bb7253
--- /dev/null
+++ b/debian/libopenjpeg-dev.links.in
@@ -0,0 +1 @@
+/usr/lib/${DEB_HOST_MULTIARCH}/libopenjpeg.so.2 /usr/lib/${DEB_HOST_MULTIARCH}/libopenjpeg.so
diff --git a/debian/libopenjpeg2.install b/debian/libopenjpeg2.install
index 3ce037c..06e36b8 100644
--- a/debian/libopenjpeg2.install
+++ b/debian/libopenjpeg2.install
@@ -1 +1,4 @@
-usr/lib/libopenjpeg.so.*
+usr/lib/*/libopenjpeg.so.*
+usr/lib/*/libopenjpeg_JPWL.so.*
+usr/lib/*/libopenjpip_local.so.*
+usr/lib/*/libopenjpip_server.so.*
diff --git a/debian/libopenjpeg2.links b/debian/libopenjpeg2.links
deleted file mode 100644
index 594e7a9..0000000
--- a/debian/libopenjpeg2.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libopenjpeg-2.1.3.0.so /usr/lib/libopenjpeg.so.2
diff --git a/debian/libopenjpeg2.links.in b/debian/libopenjpeg2.links.in
new file mode 100644
index 0000000..7a056c9
--- /dev/null
+++ b/debian/libopenjpeg2.links.in
@@ -0,0 +1 @@
+/usr/lib/${DEB_HOST_MULTIARCH}/libopenjpeg-2.1.3.0.so /usr/lib/${DEB_HOST_MULTIARCH}/libopenjpeg.so.2
diff --git a/debian/rules b/debian/rules
index dbf95c9..8625dd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,24 +3,36 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CURVER := $(shell dpkg-parsechangelog | grep ^Version | awk '{print $$2}' | cut -d- -f1 | cut -d+ -f1)
 
+debian/libopenjpeg2.links: debian/libopenjpeg2.links.in
+	sh -c "echo `cat $<`" > $@
+
+debian/libopenjpeg-dev.links: debian/libopenjpeg-dev.links.in
+	sh -c "echo `cat $<`" > $@
+
 %:
 	dh $@ \
 		--with autotools-dev
 
-override_dh_auto_configure:
+override_dh_auto_configure: debian/libopenjpeg2.links debian/libopenjpeg-dev.links
 	dh_auto_configure -- \
 		--enable-debug \
 		--enable-mj2 \
 		--enable-jpwl \
 		--enable-jpip \
 		--enable-jpip-server
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_strip:
 	dh_strip -plibopenjpeg2 --dbg-package=libopenjpeg2-dbg
 
+override_dh_clean:
+	rm -f debian/libopenjpeg-dev.links debian/libopenjpeg2.links
+	dh clean
+
 get-orig-source:
 	uscan --verbose \
 		--force-download \