diff --git a/debian/changelog b/debian/changelog
index f4343c30..c207c9df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ 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!
+    -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
 
diff --git a/tools/set_mkisofs_opts b/tools/set_mkisofs_opts
index 11b37315..743d3ad1 100755
--- a/tools/set_mkisofs_opts
+++ b/tools/set_mkisofs_opts
@@ -16,19 +16,19 @@ OPTS=
 
 case "$ARCH" in
   i386) 
-    OPTS="-J --joliet-long"
+    OPTS="-J -joliet-long"
     ;;
   amd64) 
-    OPTS="-J --joliet-long"
+    OPTS="-J -joliet-long"
     ;;
   alpha)
-    OPTS="-J --joliet-long"
+    OPTS="-J -joliet-long"
     ;;
   arm*)
-    OPTS="-J --joliet-long"
+    OPTS="-J -joliet-long"
     ;;
   s390*)
-    OPTS="-J --joliet-long"
+    OPTS="-J -joliet-long"
     ;;
   *)
     #No options by default - don't know about other arches
diff --git a/update-cd b/update-cd
index 75fb9201..9cfee49f 100755
--- a/update-cd
+++ b/update-cd
@@ -158,7 +158,7 @@ make_cd () {
 
     if [ $JTE = 1 ] ; then
 	set +e
-        ${MKISOFS} -J --joliet-long -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 --joliet-long -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