diff --git a/debian/changelog b/debian/changelog
index 3a976c38..f4343c30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 debian-cd (3.1.22) UNRELEASED; urgency=medium
 
+  [ Steve McIntyre ]
+  * Ensure that in all places where we use -J we also use
+    --joliet-long. Thanks to Thomas Schmitt again for a clear bug report!
+
  -- Steve McIntyre <93sam@debian.org>  Sat, 10 Feb 2018 00:26:46 +0000
 
 debian-cd (3.1.21) unstable; urgency=medium
diff --git a/tools/boot/buster/boot-s390x b/tools/boot/buster/boot-s390x
index 91a5e2cf..5e83d6dc 100755
--- a/tools/boot/buster/boot-s390x
+++ b/tools/boot/buster/boot-s390x
@@ -27,7 +27,6 @@ INSTALLDIR="install"
 
 # Exit if this is not CD#1/DVD#1
 if [ $N != "1" ]; then
-    add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
     add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
     add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
     exit 0
@@ -100,5 +99,4 @@ perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
 cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/"
 
 # Include the boot$N/-tree into the iso-image
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
diff --git a/tools/boot/jessie/boot-s390x b/tools/boot/jessie/boot-s390x
index 16ac083d..3b1ff247 100755
--- a/tools/boot/jessie/boot-s390x
+++ b/tools/boot/jessie/boot-s390x
@@ -27,7 +27,6 @@ CDDIR=$2
 cd $CDDIR/..
 
 if [ $N != "1" ] && [ $N != "1_NONUS" ] ; then
-    add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
     exit 0
 fi
 
@@ -90,5 +89,4 @@ perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
 cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/"
 
 # Include the boot$N/-tree into the iso-image
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
diff --git a/tools/boot/stretch/boot-s390x b/tools/boot/stretch/boot-s390x
index 91a5e2cf..5e83d6dc 100755
--- a/tools/boot/stretch/boot-s390x
+++ b/tools/boot/stretch/boot-s390x
@@ -27,7 +27,6 @@ INSTALLDIR="install"
 
 # Exit if this is not CD#1/DVD#1
 if [ $N != "1" ]; then
-    add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
     add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
     add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
     exit 0
@@ -100,5 +99,4 @@ perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
 cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/"
 
 # Include the boot$N/-tree into the iso-image
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
diff --git a/tools/set_mkisofs_opts b/tools/set_mkisofs_opts
index 6793a4e8..11b37315 100755
--- a/tools/set_mkisofs_opts
+++ b/tools/set_mkisofs_opts
@@ -16,16 +16,22 @@ OPTS=
 
 case "$ARCH" in
   i386) 
-    OPTS="-J"
+    OPTS="-J --joliet-long"
     ;;
   amd64) 
-    OPTS="-J"
+    OPTS="-J --joliet-long"
     ;;
   alpha)
-    OPTS="-J"
+    OPTS="-J --joliet-long"
+    ;;
+  arm*)
+    OPTS="-J --joliet-long"
+    ;;
+  s390*)
+    OPTS="-J --joliet-long"
     ;;
   *)
-    #No options by default
+    #No options by default - don't know about other arches
     ;;
 esac
 
diff --git a/update-cd b/update-cd
index 500db06b..75fb9201 100755
--- a/update-cd
+++ b/update-cd
@@ -158,7 +158,7 @@ make_cd () {
 
     if [ $JTE = 1 ] ; then
 	set +e
-        ${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \
+        ${MKISOFS} -J --joliet-long -r -V "Debian $VER update $TYPEUP" -o \
             ${ISODIR}/${BASENAME}.iso \
             -jigdo-jigdo ${JIGDODIR}/${BASENAME}.jigdo \
             -jigdo-template ${JIGDODIR}/${BASENAME}.template \
@@ -200,7 +200,7 @@ make_cd () {
         mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo
     else
 	set +e
-        ${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \
+        ${MKISOFS} -J --joliet-long -r -V "Debian $VER update $TYPEUP" -o \
             $OUT/iso-$TYPE/${BASENAME}.iso \
             $UPD/CD$CDNUM 2>&1 | grep "extents written"
 	if [ $? -ne 0 ] ; then