--- a/doc/manual/Makefile.generic	Sat Jun 04 21:50:03 2016 +0200
+++ b/doc/manual/Makefile.generic	Sun Jun 05 14:41:58 2016 +0200
@@ -14,7 +14,7 @@
 	# html
 	cd "${VPATH}" && ( \
 		for i in 4ct 4tc css dvi html idv lg tmp xref; do rm -f manual.$$i || true; done; \
-		for i in manual*x.png manual*.html texput.log manual_*.log zzmanual.eps zzmanual.ps custom_tex4ht.env; do rm -f $$i || true; done; \
+		for i in manual*x.png manual*.html texput.log manual_*.log zzmanual.eps zzmanual.ps custom_tex4ht.env multirow.4ht; do rm -f $$i || true; done; \
 		rm -r html || true; \
 	)
 
@@ -23,8 +23,16 @@
 
 
 html/manual.html: manual_tex4ht.cfg sources
-	# Create tex4ht.env from default one, but with better bitmaps
+	# The following runs htlatex, but sets up a few things beforehand to control
+	# it's behavior:
+	# - create custom, local version of tex4ht.env based on default one, but with
+	#   better bitmaps
+	# - create empty multirow.4ht file, to simply override tex4ht's default one,
+	#   which produces wrong output in our case - since all the tables where we
+	#   use the multirow package are rendered into .pngs for our html doc, we don't
+	#   need any tex4ht specific version outputing html
 	cd "${VPATH}" &&  ( \
+		:>./multirow.4ht; \
 		cp $$(dirname $$(which tex4ht))/../share/texmf-dist/tex4ht/base/unix/tex4ht.env ./custom_tex4ht.env; \
 		sed -E -i '' 's/(Text|Graphics)(AlphaBits)=[1,2,3]([^0-9])/\1\2=4\3/g' custom_tex4ht.env; \
 		mkdir -p ./html/; \