diff --git a/contrib/testingcds b/contrib/testingcds
old mode 100644
new mode 100755
diff --git a/debian/changelog b/debian/changelog
index 288f8217..bc31da2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,7 +48,8 @@ debian-cd (3.1.22) UNRELEASED; urgency=medium
     - add "Rules-Requires-Root: no" to support building as non-root.
   * d/rules:
     - use the awesome "dh $@" simplification.
-    - add debian/debian-cd.docs and use that.
+    - use debian/debian-cd.docs.
+    - use debian/debian-cd.install.
   * Add lintian override for missing-depends-on-sensible-utils as
     sensible-editor is merely mentioned in the README.
   * d/copyright: explicitly refer to /usr/share/common-licenses/GPL-2.
diff --git a/debian/debian-cd.install b/debian/debian-cd.install
new file mode 100644
index 00000000..5c57a753
--- /dev/null
+++ b/debian/debian-cd.install
@@ -0,0 +1,12 @@
+contrib usr/share/debian-cd/
+tools usr/share/debian-cd/
+tasks usr/share/debian-cd/
+data usr/share/debian-cd/
+Makefile usr/share/debian-cd/
+README usr/share/debian-cd/
+README.devel usr/share/debian-cd/
+build.sh usr/share/debian-cd/
+build_all.sh usr/share/debian-cd/
+update-cd usr/share/debian-cd/
+easy-build.sh usr/share/debian-cd/
+README.easy-build usr/share/debian-cd/
diff --git a/debian/rules b/debian/rules
index e0e865bb..32cd5ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,7 @@ override_dh_auto_clean:
 	:
 
 override_dh_auto_install:
-	cp -r contrib tools tasks data Makefile README README.devel build.sh \
-              build_all.sh update-cd easy-build.sh README.easy-build \
-              debian/debian-cd/usr/share/debian-cd/
+	dh_install
 	cp CONF.sh debian/debian-cd/etc/debian-cd/conf.sh
 	ln -sf /etc/debian-cd/conf.sh \
                debian/debian-cd/usr/share/debian-cd/CONF.sh
@@ -20,7 +18,3 @@ override_dh_auto_install:
 	  \( -name 'boot-*' -o -name 'post-boot-*' \) -a \! -name '*.txt' \
 	  -a \! -name '*.calc' -a \! -name boot-x86 -a \! -name boot-kfreebsd \
 	  -a \! -name boot-hurd -a \! -name '*common' | xargs chmod 0755
-	cd debian/debian-cd/usr/share/debian-cd/contrib && chmod 755 cronjob.* ftp.cron \
-		generate_firmware_images iso_run jigdo-watcher \
-		merge-sums mkjigsnap mklist mktorrent \
-		report_build_error testingcds