diff --git a/Makefile b/Makefile
index dad4ad9..329ae38 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,8 @@ css: $(ISSO_CSS_DST)
 
 man: $(RST)
 	sphinx-build -b man docs/ man/
+	mv man/isso.1 man/man1/isso.1
+	mv man/isso.conf.5 man/man5/isso.conf.5
 
 ${CSS}: docs/_static/css/site.scss
 	scss --no-cache $< $@
diff --git a/docs/conf.py b/docs/conf.py
index 1c2581e..0da47e1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -232,9 +232,9 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('docs/man/index', 'man1/isso', u'a Disqus alternative',
+    ('docs/man/index', 'isso', u'a Disqus alternative',
      [u'Martin Zimmermann'], 1),
-    ('docs/configuration/server', 'man5/isso.conf', u'server configuration',
+    ('docs/configuration/server', 'isso.conf', u'server configuration',
      [u'Martin Zimmermann'], 5)
 ]