diff --git a/debian/control b/debian/control
index a24cdf7..73a4df6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
            Stefano Karapetsas <stefano@karapetsas.com>,
            Mike Gabriel <sunweaver@debian.org>,
 Build-Depends: debhelper (>= 9),
+               cdbs,
                autotools-dev,
                pkg-config,
                libdbus-glib-1-dev,
@@ -16,23 +17,36 @@ Build-Depends: debhelper (>= 9),
                libgirepository1.0-dev,
                gobject-introspection,
                mate-common,
-               quilt,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.mate-desktop.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mate/mate-polkit.git;a=summary
 Vcs-Git: git://anonscm.debian.org/pkg-mate/mate-polkit.git
 
 Package: mate-polkit
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          policykit-1,
+         mate-polkit-common (= ${binary:Version}),
 Description: MATE authentication agent for PolicyKit-1
  The mate-polkit package provides a D-Bus session bus service that is used to
  bring up authentication dialogs used for obtaining privileges.
  .
  This package contains the MATE policy kit authentication agent.
 
+Package: mate-polkit-common
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+Description: MATE authentication agent for PolicyKit-1 (common files)
+ The mate-polkit package provides a D-Bus session bus service that is used to
+ bring up authentication dialogs used for obtaining privileges.
+ .
+ This package contains common files for the MATE policy kit authentication
+ agent.
+
 Package: libpolkit-gtk-mate-1-0
 Section: libs
 Architecture: any
@@ -65,13 +79,14 @@ Description: MATE authentication agent for PolicyKit-1 (development files)
  This package contains the development files for mate-polkit.
 
 Package: libpolkit-gtk-mate-1-0-dbg
-Section: libs
+Priority: extra
+Section: debug
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libpolkit-gtk-mate-1-0 (= ${binary:Version}),
-Description: MATE authentication agent for PolicyKit-1 (library)
+Description: MATE authentication agent for PolicyKit-1 (debugging symbols)
  The mate-polkit package provides a D-Bus session bus service that is used to
  bring up authentication dialogs used for obtaining privileges.
  .
diff --git a/debian/mate-polkit-common.install b/debian/mate-polkit-common.install
new file mode 100644
index 0000000..7034e54
--- /dev/null
+++ b/debian/mate-polkit-common.install
@@ -0,0 +1,2 @@
+etc/
+usr/share/locale/
diff --git a/debian/mate-polkit.install b/debian/mate-polkit.install
index ea7e7c9..b0bfa1a 100644
--- a/debian/mate-polkit.install
+++ b/debian/mate-polkit.install
@@ -1,3 +1 @@
-etc/
-usr/lib/polkit-mate/
-usr/share/locale/
+usr/lib/*/polkit-mate/
diff --git a/debian/patches/1001_skip-generated-desktop-file-via-POTFILES.patch b/debian/patches/1001_skip-generated-desktop-file-via-POTFILES.patch
deleted file mode 100644
index 00fcc1e..0000000
--- a/debian/patches/1001_skip-generated-desktop-file-via-POTFILES.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-Description: Skip auto-generated .desktop. file in i18n workflow
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---- a/po/POTFILES.skip
-+++ b/po/POTFILES.skip
-@@ -1 +1,2 @@
- polkitgtkmate/example.c
-+src/polkit-mate-authentication-agent-1.desktop.in
-\ No newline at end of file
diff --git a/debian/patches/README b/debian/patches/README
deleted file mode 100644
index 80c1584..0000000
--- a/debian/patches/README
+++ /dev/null
@@ -1,3 +0,0 @@
-0xxx: Grabbed from upstream development.
-1xxx: Possibly relevant for upstream adoption.
-2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6eb81cd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-1001_skip-generated-desktop-file-via-POTFILES.patch
diff --git a/debian/rules b/debian/rules
index e147bff..c056359 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,16 @@
 #!/usr/bin/make -f
 
-%:
-	dh $@ --with quilt
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
-override_dh_install:
-	dh_install --list-missing
+DEB_DH_INSTALL_ARGS += --list-missing
 
-override_dh_auto_configure:
-	./autogen.sh
-#	dh_auto_configure -- \
-#		--localstatedir=/var \
-#		--libexecdir=/usr/lib/polkit-mate \
-#		--disable-static \
-#		--disable-introspection
+DEB_CONFIGURE_SCRIPT := ./autogen.sh
 
-override_dh_strip:
-	dh_strip -plibpolkit-gtk-mate-1-0 --dbg-package=libpolkit-gtk-mate-1-0-dbg
-
-
-get-orig-source:
-	uscan --noconf --force-download --rename --download-current-version --destdir=..
+DEB_CONFIGURE_EXTRA_FLAGS := --localstatedir=/var \
+                             --libdir=/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) \
+                             --includedir=/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) \
+                             --libexecdir=/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/polkit-mate \
+                             --disable-static \
+                             --disable-introspection