diff --git a/Makefile b/Makefile
index c06adfc4..6f1b08a7 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,11 @@ manmove: mantype mancore
 	done
 	mkdir -p doc/html
 	mv doc/man/*.html doc/html
-	mv conf/type/*/man
+
+	for mantype in conf/type/*/man.html; do \
+	mannew=$$(echo $$mantype | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;');\
+	mv $$mantype doc/html/$$mannew; \
+	done
 
 # Reference depends on conf/type/*/man.text - HOWTO with posix make?
 $(MANDIR)/cdist-reference.text: manmove $(MANDIR)/cdist-reference.text.sh
@@ -92,7 +96,7 @@ $(MANDIR)/cdist-reference.text: manmove $(MANDIR)/cdist-reference.text.sh
 	
 clean:
 	rm -rf doc/man/*.html doc/man/*.[1-9] doc/man/man[1-9] $(MANGENERATED)
-	rm -f conf/type/*/man.html conf/type/*/docbook-xsl.css
+	rm -f conf/type/*/man.html
 
 ################################################################################
 # Developer targets
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index e69de29b..107023dd 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -0,0 +1 @@
+   - Ensure html output of manpages are published on the web
diff --git a/doc/dev/todo/post-1.3 b/doc/dev/todo/post-1.3
index a762737e..4988504b 100644
--- a/doc/dev/todo/post-1.3
+++ b/doc/dev/todo/post-1.3
@@ -15,4 +15,3 @@ Documentation:
       - hint: http://protempore.net/~calvins/howto/ssh-connection-sharing/
    - Different environments (production, integration, development)
       - via version control
-   - Ensure html output of manpages are published on the web