diff --git a/debian/changelog b/debian/changelog
index 0765df7..b4cf417 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+policykit-1-gnome (0.99-3) UNRELEASED; urgency=low
+
+  * Switch from cdbs to dh.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 12 Feb 2011 10:52:10 +0100
+
 policykit-1-gnome (0.99-2) unstable; urgency=low
 
   [ Robert Ancell ]
diff --git a/debian/control b/debian/control
index 6567c90..34e32a3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Michael Biebl <biebl@debian.org>, Martin Pitt <mpitt@debian.org>
-Build-Depends: cdbs,
- debhelper (>= 7),
+Build-Depends: debhelper (>= 8),
  autotools-dev,
  pkg-config,
  libdbus-glib-1-dev (>= 0.71),
diff --git a/debian/rules b/debian/rules
index 7bf9f0d..56a4f3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/utils.mk
+%:
+	dh $@
 
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-examples \
-                             --enable-gtk-doc \
-                             --disable-introspection
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--disable-examples \
+		--enable-gtk-doc \
+		--disable-introspection
+
+override_dh_auto_test: