diff --git a/debian/changelog b/debian/changelog
index 0ad429d5..2e087970 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ debian-cd (3.1.20) UNRELEASED; urgency=medium
   * Add reportbug to tasks/forcd1 - make it easier for users to report
     installation problems. Closes: #861288
   * Ensure that arm64 images include grub-efi packages
+  * Tweak the Volume ID and disk info output slightly for netinst media.
+    Closes: #858031
 
   [ Samuel Thibault ]
   * Add support for grub submenu hotkeys.
diff --git a/tools/start_new_disc b/tools/start_new_disc
index c848b45e..d7cb6add 100755
--- a/tools/start_new_disc
+++ b/tools/start_new_disc
@@ -54,18 +54,25 @@ if [ $NUM_ARCHES = 1 ] ; then
             ;;
         *)
             BINARYDISK=1
+	    DISKNUMSTRING="$DISKNUM"
             export DISKINFO="$DISKINFO_DISTRO ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE Binary-$DISKNUM $BUILD_DATE"
+	    if [ $DISKTYPE = netinst ]; then
+		# Use "n" as a "disknum" here, #858031
+		DISKNUMSTRING="n"
+		# Don't need a disknum here - only one netinst
+		export DISKINFO="$DISKINFO_DISTRO ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE $BUILD_DATE"
+	    fi
             case "$ARCHES" in
                 powerpc)
-                    export VOLID="$VOLID_BASE ppc $DISKNUM" ;;
+                    export VOLID="$VOLID_BASE ppc $DISKNUMSTRING" ;;
                 kfreebsd-i386)
-                    export VOLID="$VOLID_BASE f-i386 $DISKNUM" ;;
+                    export VOLID="$VOLID_BASE f-i386 $DISKNUMSTRING" ;;
                 kfreebsd-amd64)
-                    export VOLID="$VOLID_BASE f-amd64 $DISKNUM" ;;
+                    export VOLID="$VOLID_BASE f-amd64 $DISKNUMSTRING" ;;
                 hurd-i386)
-                    export VOLID="$VOLID_BASE h-i386 $DISKNUM" ;;
+                    export VOLID="$VOLID_BASE h-i386 $DISKNUMSTRING" ;;
                 *)
-                    export VOLID="$VOLID_BASE $ARCHES $DISKNUM" ;;
+                    export VOLID="$VOLID_BASE $ARCHES $DISKNUMSTRING" ;;
             esac
             ;;
     esac