diff --git a/CHANGELOG b/CHANGELOG
index d7580dc..bcd0fab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
 # dvdisaster changelog -*-text-*-
 
+0.79.6.patchlevel-9 27-06-2021 *UNOFFICIAL*
+- fix: using --strip in console without X server would segfault at program exit
+- enh: windows: hide useless background console
+- enh: linear read: log amount of correctly read sectors during a sesssion
+- enh: log window: use a bigger scrollback buffer
+- doc: regenerate codecs.pdf to get proper page numbers
+- chore: fix codec-specs Makefile
+
 0.79.6.patchlevel-8 22-02-2021 *UNOFFICIAL*
 - enh: gui: medium-info: add an 'exhaustive search' when not enabled in options
 - enh: gui: prefs: add a visual cue of tooltips
diff --git a/GNUmakefile.template b/GNUmakefile.template
index bd418eb..d2bc5f3 100644
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -112,24 +112,28 @@ dvdisaster: $(ICONS) $(OFILES)
 	else $(MAKE) --no-print-directory -C locale; \
 	fi
 
-src/inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png icons/strip.png icons/open-ecc.png icons/open-img.png icons/cd.png icons/gtk-help.png icons/gtk-index.png icons/gtk-preferences.png icons/gtk-quit.png icons/gtk-stop.png
+# gdk-pixbuf-csource sometimes produces truncated output, so we have to ensure the output
+# is valid before appending it to inlined-icons.h:
+src/inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png icons/strip.png icons/open-ecc.png icons/open-img.png icons/cd.png icons/gtk-help.png icons/gtk-index.png icons/gtk-preferences.png icons/gtk-quit.png icons/gtk-stop.png icons/tooltip.png icons/nothing.png
 	@echo "Building:" src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_read            icons/read.png             >src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_create          icons/create.png          >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_scan            icons/scan.png            >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_fix             icons/fix.png             >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_verify          icons/verify.png          >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_strip           icons/strip.png           >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc        icons/open-ecc.png        >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_open_img        icons/open-img.png        >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_cd              icons/cd.png              >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help        icons/gtk-help.png        >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index       icons/gtk-index.png       >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit        icons/gtk-quit.png        >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop        icons/gtk-stop.png        >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_tooltip         icons/tooltip.png         >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_nothing         icons/nothing.png         >>src/inlined-icons.h
+	@rm -f src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_read            icons/read.png            >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_create          icons/create.png          >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_scan            icons/scan.png            >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_fix             icons/fix.png             >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_verify          icons/verify.png          >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_strip           icons/strip.png           >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc        icons/open-ecc.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_open_img        icons/open-img.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_cd              icons/cd.png              >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help        icons/gtk-help.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index       icons/gtk-index.png       >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit        icons/gtk-quit.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop        icons/gtk-stop.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_tooltip         icons/tooltip.png         >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_nothing         icons/nothing.png         >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@rm -f src/.icons.tmp
 
 $(BUILDTMP)/help-dialogs.o: src/help-dialogs.c simple-md5sum
 	@if test -e fingerprints.md5; \
diff --git a/configure b/configure
index 408cfe9..56c8175 100755
--- a/configure
+++ b/configure
@@ -21,7 +21,7 @@ fi
 # Set the package name and version
 
 PACKAGE dvdisaster 0.79.6
-DEFINE_INT PATCHLEVEL 8
+DEFINE_INT PATCHLEVEL 9
 DEFINE_STRING HAVE_UNSTABLE_RELEASE 1
 
 # Check for some essential tools.