diff --git a/debian/changelog b/debian/changelog
index 5ff807bf..8db1289c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,16 @@ debian-cd (3.1.8) UNRELEASED; urgency=low
   [ Ian Campbell ]
   Rename "xm-debian.cfg" to just "debian.cfg" for Xen config.
 
+  [ Raphaël Hertzog ]
+  * Changes triggered by various lintian warnings:
+    + Switch to “3.0 (native)” source format to get rid of .svn
+      directories in the source package (when built from the svn checkout
+      directly)
+    + Support build-arch/build-indep targets in debian/rules.
+    + Drop executable rights from tools/boot/wheezy/boot-hurd
+      (and fix debian/rules to not re-add it).
+    + Bump Standards-Version to 3.9.2 (no change required).
+
  -- Steve McIntyre <93sam@debian.org>  Tue, 07 Jun 2011 23:03:42 +0100
 
 debian-cd (3.1.7) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d7ea5ef5..0bddcfa7 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian CD Group <debian-cd@lists.debian.org>
 Uploaders: Raphaël Hertzog <hertzog@debian.org>, Santiago Garcia Mantinan <manty@debian.org>, Steve McIntyre <93sam@debian.org>
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: tofrodos
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/debian-cd/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-cd/trunk?op=log
 
diff --git a/debian/rules b/debian/rules
index 239acc13..d43f823c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
 
-build: build-stamp
+build-arch build-indep: build-stamp
 build-stamp:
 	dh_testdir
 	touch build-stamp
@@ -32,7 +32,8 @@ install-stamp: build-stamp
 	find debian/debian-cd -name '.svn' | xargs -r rm -rf
 	find debian/debian-cd/usr/share/debian-cd/tools/boot \
 	  \( -name 'boot-*' -o -name 'post-boot-*' \) -a \! -name '*.txt' \
-	  -a \! -name '*.calc' -a \! -name boot-x86 -a \! -name boot-kfreebsd | xargs chmod 0755
+	  -a \! -name '*.calc' -a \! -name boot-x86 -a \! -name boot-kfreebsd \
+	  -a \! -name boot-hurd | 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 \
@@ -65,4 +66,5 @@ binary-indep: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+build: build-arch build-indep
+.PHONY: build-arch build-indep  build clean binary-indep binary-arch binary
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000..89ae9db8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/tools/boot/wheezy/boot-hurd b/tools/boot/wheezy/boot-hurd
old mode 100755
new mode 100644