diff --git a/Makefile b/Makefile
index 537405dd6517fe602348f1ca13ab9ec2eef53914..b161bdecd7634a5ecec6b563e3487941490be44a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,18 +7,25 @@ endif
 LATEX_INPUT_FILES = $(BOOK_BASE).tex compliance-guide.tex license-texts.tex enforcement-case-studies.tex gpl-lgpl.tex
 BOOK_CLASS_FILE = gpl-book.cls
 
+HTML_OUTPUT_DIR = public_html
+
 TEX4HT=tex4ht
 T4HT=t4ht
+HTLATEX=htlatex
 PDFLATEX = pdflatex
 LATEX = latex
 BIBTEX = bibtex
 FIG2DEV = fig2dev
 DVIPS=dvips
 
-all:	err $(BOOK_BASE).pdf $(BOOK_BASE).ps $(BOOK_BASE).html
+all:	err $(BOOK_BASE).pdf $(BOOK_BASE).ps html
 
 pdf:	err $(BOOK_BASE).pdf
 
+html:	$(HTML_OUTPUT_DIR)/monolithic/$(BOOK_BASE).html $(HTML_OUTPUT_DIR)/$(BOOK_BASE).html pdf $(BOOK_BASE).ps
+	/bin/ln -f $(BOOK_BASE).ps $(HTML_OUTPUT_DIR)/$(BOOK_BASE).ps
+	/bin/ln -f $(BOOK_BASE).pdf $(HTML_OUTPUT_DIR)/$(BOOK_BASE).pdf
+
 .SUFFIXES: .fig .postscript .eps .pdf .pstex_t .pstex .ps .dvi .tex
 
 .postscript.pdf:
@@ -45,20 +52,46 @@ pdf:	err $(BOOK_BASE).pdf
 $(BOOK_BASE).pdf: $(PDF_FIGS) $(LATEX_INPUT_FILES) $(BOOK_CLASS_FILE)
 	$(PDFLATEX) $(BOOK_BASE)
 	$(PDFLATEX) $(BOOK_BASE)
+	$(PDFLATEX) $(BOOK_BASE)
 
-$(BOOK_BASE).html: $(LATEX_INPUT_FILES) $(BOOK_CLASS_FILE)
-	echo "building HTML"
-	$(LATEX)  '\def\generateHTML{\hfill}'  '\input'  $(BOOK_BASE).tex
-	$(LATEX)  '\def\generateHTML{\hfill}'   '\input'  $(BOOK_BASE).tex
-	$(TEX4HT) -f/$(BOOK_BASE).tex -i/$(BOOK_TEX_PATH)
-	$(T4HT) -f/$(BOOK_BASE).tex
-	rm $(BOOK_BASE).dvi
+$(HTML_OUTPUT_DIR)/monolithic/$(BOOK_BASE).html: $(LATEX_INPUT_FILES) $(BOOK_CLASS_FILE)
+	mkdir -p $(HTML_OUTPUT_DIR)/monolithic/js
+	mkdir -p $(HTML_OUTPUT_DIR)/monolithic/css
+	/bin/rm -f $(BOOK_BASE)*.html
+	/bin/rm -f $(BOOK_BASE)*.js
+	$(HTLATEX) comprehensive-gpl-guide.tex "webhacks,xhtml,mouseover"
+	$(HTLATEX) comprehensive-gpl-guide.tex "webhacks,xhtml,mouseover"
+	mv ${BOOK_BASE}*js $(HTML_OUTPUT_DIR)/monolithic/js
+	/bin/rm -f $(BOOK_BASE)*.html
+	/bin/rm -f $(BOOK_BASE)*.js
+	$(HTLATEX) comprehensive-gpl-guide.tex "webhacks,xhtml"
+	mv $(BOOK_BASE)*html $(HTML_OUTPUT_DIR)/monolithic
+	mv cm*png $(HTML_OUTPUT_DIR)/monolithic
+	mv ${BOOK_BASE}*css $(HTML_OUTPUT_DIR)/monolithic
+	cp -pa js/*js $(HTML_OUTPUT_DIR)/monolithic/js
+	cp -pa css/*css $(HTML_OUTPUT_DIR)/monolithic/css
+
+$(HTML_OUTPUT_DIR)/$(BOOK_BASE).html: $(LATEX_INPUT_FILES) $(BOOK_CLASS_FILE)
+	mkdir -p $(HTML_OUTPUT_DIR)/js
+	mkdir -p $(HTML_OUTPUT_DIR)/css
+	/bin/rm -f $(BOOK_BASE)*.html
+	/bin/rm -f $(BOOK_BASE)*.js
+	$(HTLATEX) comprehensive-gpl-guide.tex "webhacks,xhtml,3,next,mouseover"
+	mv ${BOOK_BASE}*js $(HTML_OUTPUT_DIR)/js
+	/bin/rm -f $(BOOK_BASE)*.html
+	/bin/rm -f $(BOOK_BASE)*.js
+	$(HTLATEX) comprehensive-gpl-guide.tex "webhacks,3,next,webhacks"
+	mv ${BOOK_BASE}*css $(HTML_OUTPUT_DIR)
+	mv ${BOOK_BASE}*html $(HTML_OUTPUT_DIR)
+	mv cm*png $(HTML_OUTPUT_DIR)
+	cp -pa js/*js $(HTML_OUTPUT_DIR)/js
+	cp -pa css/*css $(HTML_OUTPUT_DIR)/css
 
 $(BOOK_BASE).dvi: $(LATEX_INPUT_FILES) $(EPS_FIGS) ${BOOK_CLASS_FILE}
 	$(LATEX)  $(BOOK_BASE).tex
 	$(LATEX)  $(BOOK_BASE).tex
 
 clean:
-	/bin/rm -f $(BOOK_BASE).ps $(BOOK_BASE).pdf $(BOOK_BASE).log texput.log $(BOOK_BASE).lg $(BOOK_BASE).tmp $(BOOK_BASE).xref *.4ct *.4tc *.aux *.dvi $(BOOK_BASE)*.html *.idv *.lg *.tmp $(BOOK_BASE).css $(BOOK_BASE).log $(BOOK_BASE).out $(BOOK_BASE)-js.*
-
+	/bin/rm -f $(BOOK_BASE).ps $(BOOK_BASE).pdf $(BOOK_BASE).log texput.log $(BOOK_BASE).lg $(BOOK_BASE).tmp $(BOOK_BASE).xref *.4ct *.4tc *.aux *.dvi $(BOOK_BASE)*.html *.idv *.lg *.tmp $(BOOK_BASE).css $(BOOK_BASE).log $(BOOK_BASE).out $(BOOK_BASE)-js.* cm*png
+	/bin/rm -rf public_html
 err: ; $(ERR)