diff --git a/debian/changelog b/debian/changelog
index acc5318b..c83b5661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
     + Make tools/update_popcon exit with errors when it fails
     + Make tools/update_popcon deal with https on popcon.d.o
     + Declare 'my' instances of '$_' as 'local' in tools/make_disc_trees.pl
+    + Ensure that in all places where we use -J we also use --joliet-long
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 
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/update-cd b/update-cd
index c69e707d..7eb02d15 100755
--- a/update-cd
+++ b/update-cd
@@ -161,7 +161,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 \
@@ -203,7 +203,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