diff -Nru upower-0.99.4/debian/changelog upower-0.99.4/debian/changelog
--- upower-0.99.4/debian/changelog	2016-06-10 08:28:39.000000000 +0000
+++ upower-0.99.4/debian/changelog	2016-09-19 13:55:05.000000000 +0000
@@ -1,3 +1,12 @@
+upower (0.99.4-4) unstable; urgency=medium
+
+  * Install typelib files into multiarch paths.
+  * Mark gir1.2-upowerglib-1.0 and libupower-glib-dev as Multi-Arch: same and
+    upower-doc as Multi-Arch: foreign.
+  * Use dh-exec to install architecture specific files.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 19 Sep 2016 15:55:05 +0200
+
 upower (0.99.4-3) unstable; urgency=medium
 
   * UpKbdBacklight: Don't cache the brightness level, always read
diff -Nru upower-0.99.4/debian/control upower-0.99.4/debian/control
--- upower-0.99.4/debian/control	2016-06-10 08:28:39.000000000 +0000
+++ upower-0.99.4/debian/control	2016-09-19 13:55:05.000000000 +0000
@@ -6,6 +6,7 @@
            Martin Pitt <mpitt@debian.org>,
 Build-Depends: autotools-dev,
                debhelper (>= 9),
+               dh-exec,
                gobject-introspection (>= 0.9.12-4~),
                gtk-doc-tools,
                intltool (>= 0.40.0),
@@ -40,8 +41,9 @@
  operations (such as suspending the system) are restricted using PolicyKit.
 
 Package: upower-doc
-Architecture: all
 Section: doc
+Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Suggests: devhelp,
 Description: abstraction for power management - documentation
@@ -51,9 +53,9 @@
  operations (such as suspending the system) are restricted using PolicyKit.
 
 Package: libupower-glib3
+Section: libs
 Architecture: any
 Multi-Arch: same
-Section: libs
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
@@ -67,8 +69,9 @@
  This package contains the shared library to be used by applications.
 
 Package: libupower-glib-dev
-Architecture: any
 Section: libdevel
+Architecture: any
+Multi-Arch: same
 Depends: gir1.2-upowerglib-1.0 (= ${binary:Version}),
          libupower-glib3 (= ${binary:Version}),
          libglib2.0-dev,
@@ -85,6 +88,7 @@
 Package: gir1.2-upowerglib-1.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${misc:Depends},
          ${shlibs:Depends},
diff -Nru upower-0.99.4/debian/gir1.2-upowerglib-1.0.install upower-0.99.4/debian/gir1.2-upowerglib-1.0.install
--- upower-0.99.4/debian/gir1.2-upowerglib-1.0.install	2016-06-10 08:28:39.000000000 +0000
+++ upower-0.99.4/debian/gir1.2-upowerglib-1.0.install	2016-09-19 13:55:05.000000000 +0000
@@ -1 +1 @@
-usr/lib/*/girepository-1.0/ usr/lib/
+usr/lib/*/girepository-1.0/
diff -Nru upower-0.99.4/debian/rules upower-0.99.4/debian/rules
--- upower-0.99.4/debian/rules	2016-06-10 08:28:39.000000000 +0000
+++ upower-0.99.4/debian/rules	2016-09-19 13:55:05.000000000 +0000
@@ -20,12 +20,7 @@
 	# test suite needs system D-BUS and thus does not work on buildds
 
 override_dh_install:
-	dh_install --fail-missing -Xrules.d -X.la
-	# Only install udev rules on Linux architectures. The
-	# directory doesn't even exist on e.g. GNU/kFreeBSD
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-	dh_install -pupower debian/tmp/lib/udev/rules.d/
-endif
+	dh_install --fail-missing -X.la
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -c4
diff -Nru upower-0.99.4/debian/upower.install upower-0.99.4/debian/upower.install
--- upower-0.99.4/debian/upower.install	2016-06-10 08:28:39.000000000 +0000
+++ upower-0.99.4/debian/upower.install	2016-09-19 13:55:05.000000000 +0000
@@ -1,6 +1,8 @@
+#!/usr/bin/dh-exec
 etc/UPower/UPower.conf
 etc/dbus-1/system.d/
 lib/systemd/
+[linux-any] lib/udev/rules.d/
 usr/bin/upower
 usr/lib/upower/upowerd
 usr/share/dbus-1/