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 ed525b5..a9f9b15 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Harald Welte <laforge@gnumonks.org>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libpcsclite-dev, pkg-config
+Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libpcsclite-dev, pkg-config
 Standards-Version: 3.9.3
 Homepage: http://bb.osmocom.org/trac/wiki/libosmocore
 Vcs-Git: git://git.osmocom.org/libosmocore.git
@@ -12,59 +12,69 @@
 Section: libs
 Architecture: any
 Depends: libosmocodec0, libosmocore6, libosmogb3, libosmogsm5, libosmovty1, ${misc:Depends}
+Multi-Arch: foreign
 Description: Open Source MObile COMmunications CORE library
 
 Package: libosmocodec0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Osmo codec library
 
 Package: libosmocore6
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Osmo Core library
 
 Package: libosmogb3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Osmo GPRS GB library
 
 Package: libosmogsm5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Osmo GSM utility library
 
 Package: libosmovty1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Osmo VTY library
 
 Package: libosmoctrl0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Osmo control library
 
 Package: libosmosim0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Osmo SIM library
 
 Package: libosmocore-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, libosmocore
+Multi-Arch: same
 Description: Development headers for Open Source MObile COMmunications CORE library
 
 Package: libosmocore-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore
+Multi-Arch: same
 Description: Utilities for gsm
 
 Package: libosmocore-dbg
@@ -72,4 +82,5 @@
 Section: debug
 Priority: extra
 Depends: libosmocore (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Debug symbols for Open Source MObile COMmunications CORE library
diff --git a/debian/libosmocodec0.install b/debian/libosmocodec0.install
index 2743b53..2676133 100644
--- a/debian/libosmocodec0.install
+++ b/debian/libosmocodec0.install
@@ -1 +1 @@
-usr/lib/libosmocodec*.so.*
+usr/lib/*/libosmocodec*.so.*
diff --git a/debian/libosmocore-dev.install b/debian/libosmocore-dev.install
index ece5b08..7c5a789 100644
--- a/debian/libosmocore-dev.install
+++ b/debian/libosmocore-dev.install
@@ -1,6 +1,6 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/lib*.la
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/lib*.la
+usr/lib/*/pkgconfig/*
 usr/share/doc/libosmocore/*
diff --git a/debian/libosmocore6.install b/debian/libosmocore6.install
index d134902..b73331b 100644
--- a/debian/libosmocore6.install
+++ b/debian/libosmocore6.install
@@ -1 +1 @@
-usr/lib/libosmocore*.so.*
+usr/lib/*/libosmocore*.so.*
diff --git a/debian/libosmoctrl0.install b/debian/libosmoctrl0.install
index 6b23be8..56c64fc 100644
--- a/debian/libosmoctrl0.install
+++ b/debian/libosmoctrl0.install
@@ -1 +1 @@
-usr/lib/libosmoctrl*.so.*
+usr/lib/*/libosmoctrl*.so.*
diff --git a/debian/libosmogb3.install b/debian/libosmogb3.install
index 73ad3d3..4c47425 100644
--- a/debian/libosmogb3.install
+++ b/debian/libosmogb3.install
@@ -1 +1 @@
-usr/lib/libosmogb*.so.*
+usr/lib/*/libosmogb*.so.*
diff --git a/debian/libosmogsm5.install b/debian/libosmogsm5.install
index 12c9180..5e61729 100644
--- a/debian/libosmogsm5.install
+++ b/debian/libosmogsm5.install
@@ -1 +1 @@
-usr/lib/libosmogsm*.so.*
+usr/lib/*/libosmogsm*.so.*
diff --git a/debian/libosmosim0.install b/debian/libosmosim0.install
index 8f29c4d..0a780ab 100644
--- a/debian/libosmosim0.install
+++ b/debian/libosmosim0.install
@@ -1 +1 @@
-usr/lib/libosmosim*.so.*
+usr/lib/*/libosmosim*.so.*
diff --git a/debian/libosmovty1.install b/debian/libosmovty1.install
index 1b993e8..fbf6a5f 100644
--- a/debian/libosmovty1.install
+++ b/debian/libosmovty1.install
@@ -1 +1 @@
-usr/lib/libosmovty*.so.*
+usr/lib/*/libosmovty*.so.*