--- a/doc/manual/Makefile.generic	Sun Mar 06 16:28:01 2016 +0100
+++ b/doc/manual/Makefile.generic	Sun Mar 06 23:30:44 2016 +0100
@@ -4,18 +4,28 @@
 
 manual.pdf: sources
 	# run twice for toc on some tex installs
-	cd ${VPATH} && pdflatex -output-directory=${PWD} manual.tex
-	cd ${VPATH} && pdflatex -output-directory=${PWD} manual.tex
+	cd "${VPATH}" && for i in 1 2; do pdflatex -output-directory="${PWD}" manual.tex; done
 
-manual.html: manual_tex4ht.cfg sources
+html/manual.html: manual_tex4ht.cfg sources
 	# Create tex4ht.env from default one, but with better bitmaps
-	cp $$(dirname $$(which tex4ht))/../share/texmf-dist/tex4ht/base/unix/tex4ht.env ${VPATH}/
-	cd ${VPATH} && sed -E -i '' 's/(Text|Graphics)(AlphaBits)=[1,2,3]([^0-9])/\1\2=4\3/g' tex4ht.env
-	cd ${VPATH} && htlatex manual.tex manual_tex4ht " -cunihtf"
+	cd "${VPATH}" &&  ( \
+		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/; \
+		htlatex manual.tex manual_tex4ht " -cunihtf -e./custom_tex4ht.env -utf8" -d./html/; \
+		rm ./html/*.css; \
+	)
+
+pdf: manual.pdf
+
+html:: html/manual.html
 
 clean:
 	# pdf
-	for i in pdf aux lof log lol lot out toc; do rm -f manual.$$i || true; done
+	cd "${VPATH}" && for i in pdf aux lof log lol lot out toc; do rm -f manual.$$i || true; done
 	# html
-	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 tex4ht.env; do rm -f $$i || true; done
+	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; \
+		rm -r html || true; \
+	)