diff --git a/debian/changelog b/debian/changelog
index 2e54fbb4..24a66d8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ debian-cd (3.1.21) unstable; urgency=medium
   * Update references to point to salsa.d.o for git repo
   * Fix isolinux config parsing. Thanks to Philipp Hahn for the
     patch. Closes: #886655
+  * Minor packaging updates:
+    + Remove the executable bit from various shell function files
 
   [ JH Chatenet ]
   * Include debian-ports-archive-keyring on non released architectures
diff --git a/debian/rules b/debian/rules
index d43f823c..dc514e2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ install-stamp: build-stamp
 	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 \
-	  -a \! -name boot-hurd | xargs chmod 0755
+	  -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 \
diff --git a/tools/boot/buster/boot-arm-common b/tools/boot/buster/boot-arm-common
old mode 100755
new mode 100644
index 3ad26ff5..0b4681fb
--- a/tools/boot/buster/boot-arm-common
+++ b/tools/boot/buster/boot-arm-common
@@ -1,5 +1,3 @@
-#!/bin/sh
-#
 # Do common install stuff for armel/armhf, including making bootable CDs
 # Works with debian-installer
 #
diff --git a/tools/boot/stretch/boot-arm-common b/tools/boot/stretch/boot-arm-common
old mode 100755
new mode 100644
index 3ad26ff5..0b4681fb
--- a/tools/boot/stretch/boot-arm-common
+++ b/tools/boot/stretch/boot-arm-common
@@ -1,5 +1,3 @@
-#!/bin/sh
-#
 # Do common install stuff for armel/armhf, including making bootable CDs
 # Works with debian-installer
 #