diff --git a/debian/control b/debian/control
index 2871a697f..e97d8c13a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: Debian Live <debian-live@lists.debian.org>
 Uploaders: Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: gettext
 Standards-Version: 3.8.3
 Homepage: http://debian-live.alioth.debian.org/
diff --git a/debian/bug/live-helper.presubj b/debian/live-helper.bug-presubj
similarity index 100%
rename from debian/bug/live-helper.presubj
rename to debian/live-helper.bug-presubj
diff --git a/debian/bug/live-helper.script b/debian/live-helper.bug-script
similarity index 100%
rename from debian/bug/live-helper.script
rename to debian/live-helper.bug-script
diff --git a/debian/rules b/debian/rules
index 4b7ce63ae..c9fd0ff8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,17 @@
 #!/usr/bin/make -f
 
-clean:
-	dh_testdir
-	dh_testroot
+%:
+	dh ${@}
 
+override_dh_auto_clean:
 	$(MAKE) -C po clean
 
-	dh_clean
-
-build:
-	$(MAKE) test
+override_dh_auto_build:
 	$(MAKE) -C po update-po
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+override_dh_auto_install:
+	dh_auto_install
 
-	# Installing package
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/live-helper
-
-	# Installing message catalogs
 	$(MAKE) -C po install DESTDIR=$(CURDIR)/debian/live-helper
 
 	install -D -m 0644 debian/live-helper.default debian/live-helper/etc/default/live-helper_autobuild
@@ -35,27 +25,6 @@ install: build
 	rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog
 	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.live-package debian/live-helper/usr/share/doc/live-helper/changelog.live-package
 
-	# Installing bug control
-	install -D -m 0644 debian/bug/live-helper.presubj debian/live-helper/usr/share/bug/live-helper/presubj
-	install -D -m 0755 debian/bug/live-helper.script debian/live-helper/usr/share/bug/live-helper/script
 
-binary: binary-indep
-
-binary-arch:
-
-binary-indep: install
-	dh_testdir
-	dh_testroot
+override_dh_installchangelogs:
 	dh_installchangelogs docs/ChangeLog
-	dh_installdocs
-	dh_installlogrotate
-	dh_installcron
-	dh_installman
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-.PHONY: clean build install binary binary-arch binary-indep