diff --git a/debian/changelog b/debian/changelog
index 822d7b93..256ac05f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ debian-cd (3.1.21) UNRELEASED; urgency=medium
   * Make update_popcon deal with https on popcon.d.o
   * Depend on wget instead of just Recommending it.
   * Update references to point to salsa.d.o for git repo
+  * Fix isolinux config parsing. Thanks to Philipp Hahn for the
+    patch. Closes: #886655
 
   [ JH Chatenet ]
   * Include debian-ports-archive-keyring on non released architectures
diff --git a/tools/boot/buster/parse_isolinux b/tools/boot/buster/parse_isolinux
index 5ed32cbb..a15e52d2 100755
--- a/tools/boot/buster/parse_isolinux
+++ b/tools/boot/buster/parse_isolinux
@@ -66,6 +66,8 @@ sub parse_file {
 	    if ($in_ifcpu == 3) {
 		parse_file($1);
 		$in_ifcpu = 1;
+	    } else {
+		push(@lines, $line);
 	    }
 	} elsif ($line =~ /append (.*)$/ && $in_ifcpu == 2) {
 	    # Parse out the first entry - that's what we want to use
diff --git a/tools/boot/stretch/parse_isolinux b/tools/boot/stretch/parse_isolinux
index 5ed32cbb..a15e52d2 100755
--- a/tools/boot/stretch/parse_isolinux
+++ b/tools/boot/stretch/parse_isolinux
@@ -66,6 +66,8 @@ sub parse_file {
 	    if ($in_ifcpu == 3) {
 		parse_file($1);
 		$in_ifcpu = 1;
+	    } else {
+		push(@lines, $line);
 	    }
 	} elsif ($line =~ /append (.*)$/ && $in_ifcpu == 2) {
 	    # Parse out the first entry - that's what we want to use