diff --git a/docs/Makefile b/docs/Makefile
index 0753cfe..002658e 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -16,6 +16,15 @@ html: $(HTML_TARGETS)
 $(HTML_TARGETS): %.html : %.rst
 	$(RST2HTML) $? $@
 
+manhtml: offlineimap.html offlineimapui.html
+
+offlineimap.html: offlineimap.txt offlineimap.known_issues.txt
+	a2x -v -d manpage -D manhtml -f xhtml $<
+
+offlineimapui.html: offlineimapui.txt
+	a2x -v -d manpage -D manhtml -f xhtml $<
+
+
 man: offlineimap.1 offlineimapui.7
 
 offlineimap.1: offlineimap.txt offlineimap.known_issues.txt
@@ -30,12 +39,14 @@ api:
 websitedoc:
 	./website-doc.sh releases
 	./website-doc.sh api
+	./website-doc.sh html
 	./website-doc.sh contrib
 
 clean:
 	$(RM) -f $(HTML_TARGETS)
 	$(RM) -f offlineimap.1
 	$(RM) -f offlineimap.7
+	$(RM) -f manhtml/*
 	$(RM) -rf html/*
 	-find ./docs -name '*.html' -exec rm -f {} \;
 
diff --git a/docs/manhtml/.lock b/docs/manhtml/.lock
new file mode 100644
index 0000000..e69de29
diff --git a/docs/website-doc.sh b/docs/website-doc.sh
index 2614ccc..a7f1ee2 100755
--- a/docs/website-doc.sh
+++ b/docs/website-doc.sh
@@ -126,6 +126,15 @@ function releases () {
   rm -f "$ANNOUNCES_YML_TMP"
 }
 
+function manhtml () {
+  set -e
+
+  cd ./docs
+  make manhtml
+  cd ..
+  cp -av ./docs/manhtml/* "$DOCBASE"
+}
+
 
 exit_code=0
 test "n$ARGS" = 'n' && ARGS='usage' # no option passed
@@ -139,6 +148,9 @@ do
     "napi")
       api
       ;;
+    "nhtml")
+      manhtml
+      ;;
     "ncontrib")
       contrib
       ;;