diff --git a/debian/changelog b/debian/changelog
index f45a5f0c..798851ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-libgtop2 (2.34.1-1) UNRELEASED; urgency=medium
+libgtop2 (2.34.1-1) unstable; urgency=medium
 
   * New upstream release.
   * Update build-dependencies according to configure.ac changes:
     - drop intltool
+  * Convert from cdbs to dh
+  * Add debian/docs to install AUTHORS NEWS README
 
- -- Andreas Henriksson <andreas@fatal.se>  Tue, 30 Aug 2016 20:44:19 +0200
+ -- Andreas Henriksson <andreas@fatal.se>  Wed, 31 Aug 2016 10:20:31 +0200
 
 libgtop2 (2.34.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 90e9e4d5..54cd66e0 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 9),
                libglib2.0-dev (>= 2.6.0),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
-               cdbs (>= 0.4.93),
                texinfo,
                libxt-dev,
                libgeom-dev [kfreebsd-any],
diff --git a/debian/control.in b/debian/control.in
index 97273055..2ee53c85 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 9),
                libglib2.0-dev (>= 2.6.0),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
-               cdbs (>= 0.4.93),
                texinfo,
                libxt-dev,
                libgeom-dev [kfreebsd-any],
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 00000000..6f83607c
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/debian/rules b/debian/rules
index ea60cd7f..23c6cf03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
 
 GNOME_MODULE := libgtop
 
@@ -17,19 +12,28 @@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 CPPFLAGS += $(shell pkg-config --cflags libbsd-overlay)
 endif
 
-DEB_DH_AUTORECONF_ARGS = --as-needed
+%:
+	dh $@ --with gnome,autoreconf
 
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.32.0)'
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-                             --libexecdir=\$${libdir}/$(SHARED_PKG)
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+		--libexecdir=\$${libdir}/$(SHARED_PKG)
 
-DEB_FIXPERMS_EXCLUDE += libgtop_server2
+override_dh_makeshlibs:
+	dh_makeshlibs -V '$(SHARED_PKG) (>= 2.32.0)'
 
+override_dh_fixperms:
+	dh_fixperms -X libgtop_server2
+
+override_dh_install:
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-install/$(SHARED_PKG)::
 	# The server is only necessary on kFreeBSD
 	dh_install --autodest -p$(SHARED_PKG) \
 		--ignore=debian/$(SHARED_PKG).install \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(SHARED_PKG)/libgtop_server2
 endif
+	dh_install