diff --git a/debian/changelog b/debian/changelog
index b1f9b45..5770069 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ pcsc-lite (1.8.3-1) unstable; urgency=low
     --export=configure as we use it in debian/rules. This is needed to easily
     packport the package.
     Thanks to Jean-Michel Pouré for the bug report.
+  * Add multi-arch support. (LP: #949912)
 
- -- Ludovic Rousseau <rousseau@debian.org>  Fri, 30 Mar 2012 14:26:01 +0200
+ -- Ludovic Rousseau <rousseau@debian.org>  Fri, 30 Mar 2012 14:32:19 +0200
 
 pcsc-lite (1.8.2-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 441a411..a27f5d4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pcsc-lite
 Section: misc
 Priority: optional
 Maintainer: Ludovic Rousseau <rousseau@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), flex, autotools-dev, libudev-dev [linux-any], libusb2-dev [kfreebsd-any], pkg-config, dpkg-dev (>= 1.16.1~)
+Build-Depends: debhelper (>= 9), flex, autotools-dev, libudev-dev [linux-any], libusb2-dev [kfreebsd-any], pkg-config, dpkg-dev (>= 1.16.1~)
 Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/pcsc-lite/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/pcsc-lite/trunk/
@@ -24,6 +24,7 @@ Package: libpcsclite-dev
 Section: libdevel
 Architecture: any
 Depends: libpcsclite1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Recommends: python
 Description: Middleware to access a smart card using PC/SC (development files)
  The purpose of PC/SC Lite is to provide a Windows(R) SCard interface
@@ -55,6 +56,8 @@ Section: libs
 Architecture: any
 Breaks: libpcsclite-dev (<< ${binary:Version}), pcscd (<< ${binary:Version})
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Suggests: pcscd (= ${binary:Version})
 Description: Middleware to access a smart card using PC/SC (library)
  The purpose of PC/SC Lite is to provide a Windows(R) SCard interface
diff --git a/debian/libpcsclite-dev.install b/debian/libpcsclite-dev.install
index cbe64a3..e77c34a 100644
--- a/debian/libpcsclite-dev.install
+++ b/debian/libpcsclite-dev.install
@@ -1,5 +1,5 @@
 usr/include/PCSC/*
-usr/lib/libpcsclite.so
-usr/lib/pkgconfig/libpcsclite.pc
-usr/lib/libpcscspy.so*
+usr/lib/*/libpcsclite.so
+usr/lib/*/pkgconfig/libpcsclite.pc
+usr/lib/*/libpcscspy.so*
 usr/bin/pcsc-spy
diff --git a/debian/libpcsclite1.install b/debian/libpcsclite1.install
index 70fdd33..b43e071 100644
--- a/debian/libpcsclite1.install
+++ b/debian/libpcsclite1.install
@@ -1 +1 @@
-usr/lib/libpcsclite.so.1*
+usr/lib/*/libpcsclite.so.1*
diff --git a/debian/rules b/debian/rules
index f61d042..bfdbc7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ endif
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(EXTRA_CONFIGURE_ARGS) --with-systemdsystemunitdir=/lib/systemd/system $(shell dpkg-buildflags --export=configure)
+	dh_auto_configure -- $(EXTRA_CONFIGURE_ARGS) --with-systemdsystemunitdir=/lib/systemd/system --enable-usbdropdir=/usr/lib/pcsc/drivers $(shell dpkg-buildflags --export=configure)
 
 override_dh_strip:
 	dh_strip --dbg-package=libpcsclite-dbg