7 files changed, 10 insertions, 10 deletions
diff --git a/debian/compat b/debian/compat
index 7f8f011e..ec635144 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index f3476812..27b1040a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libunistring
 Priority: optional
 Maintainer: Andreas Rottmann <rotty@debian.org>
-Build-Depends: cdbs, debhelper (>= 7), autotools-dev
+Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 8.1.3~), autotools-dev
 Standards-Version: 3.9.1
 Section: libs
 Homepage: http://www.gnu.org/software/libunistring/
@@ -11,6 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/libunistring.git
 Package: libunistring-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libunistring0 (= ${binary:Version}), ${misc:Depends}
 Description: Unicode string library for C - development files
  The 'libunistring' library implements Unicode strings (in the UTF-8,
@@ -26,6 +27,8 @@ Description: Unicode string library for C - development files
 
 Package: libunistring0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Unicode string library for C
  The 'libunistring' library implements Unicode strings (in the UTF-8,
diff --git a/debian/libunistring-dev.dirs b/debian/libunistring-dev.dirs
deleted file mode 100644
index f3635cd6..00000000
--- a/debian/libunistring-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/share/doc/libunistring-dev
diff --git a/debian/libunistring-dev.install b/debian/libunistring-dev.install
index be23c017..893c07e3 100644
--- a/debian/libunistring-dev.install
+++ b/debian/libunistring-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
 usr/share/doc/libunistring/*.html usr/share/doc/libunistring-dev/html/
diff --git a/debian/libunistring0.dirs b/debian/libunistring0.dirs
deleted file mode 100644
index 68457717..00000000
--- a/debian/libunistring0.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libunistring0.install b/debian/libunistring0.install
index d0dbfd18..3ddde584 100644
--- a/debian/libunistring0.install
+++ b/debian/libunistring0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 7d81463e..79f61e70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,8 @@ ifneq ($(findstring $(DEB_BUILD_ARCH), mips mipsel),)
 	CFLAGS += -mplt
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror \
+	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_DH_INSTALL_ARGS := --sourcedir=$(DEB_DESTDIR)
 
 DEB_MAKE_CHECK_TARGET = check