diff --git a/Makefile b/Makefile
index 4d15b51d55..dde985de68 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,12 @@ LWT_UNIX ?= $(shell if ocamlfind query lwt.unix >/dev/null 2>&1; then echo --ena
 ASYNC ?= $(shell if ocamlfind query async >/dev/null 2>&1; then echo --enable-async; fi)
 JS ?= $(shell if ocamlfind query js_of_ocaml >/dev/null 2>&1; then echo --enable-js; fi)
 
+DOCDIR = docs
+DOC_COHTTP = $(DOCDIR)/cohttp
+DOC_ASYNC = $(DOCDIR)/async
+DOC_LWT = $(DOCDIR)/cohttp_lwt
+DOC_LWTUNIX = $(DOCDIR)/cohttp_lwt_unix
+
 setup.bin: setup.ml
 	ocamlopt.opt -o $@ $< 2>/dev/null || ocamlopt -o $@ $< 2>/dev/null || ocamlc -o $@ $<
 	rm -f setup.cmx setup.cmi setup.o setup.cmo
@@ -22,6 +28,21 @@ build: setup.data setup.bin
 doc: setup.data setup.bin
 	./setup.bin -doc
 
+github: doc
+	git checkout gh-pages
+	git merge master --no-edit
+	$(MAKE)
+	rm -Rf $(DOCDIR)
+	mkdir -p $(DOC_COHTTP) $(DOC_ASYNC) $(DOC_LWT) $(DOC_LWTUNIX)
+	cp _build/lib/cohttp.docdir/* $(DOC_COHTTP)
+	cp _build/async/cohttp_async.docdir/* $(DOC_ASYNC)
+	cp _build/lwt/cohttp_lwt.docdir/* $(DOC_LWT)
+	cp _build/lwt/cohttp_lwt_unix.docdir/* $(DOC_LWTUNIX)
+	git add $(DOCDIR)/*/*.html $(DOCDIR)/*/*.css
+	git commit -m 'sync ocamldoc' *.html *.css
+	git push
+	git checkout master
+
 install: setup.bin
 	./setup.bin -install