diff --git a/Makefile b/Makefile
index c8c5a540..0cea6401 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ release: signed-rpm signed-tarball deb
 man2html:
 	@for file in oz-install oz-customize oz-generate-icicle oz-cleanup-cache oz-examples; do \
 		echo "Generating $$file HTML page from man" ; \
-		groff -mandoc -mwww man/$$file.1 -T html > man/$$file.html ; \
+		groff -mandoc -mwww man/$$file.? -T html > man/$$file.html ; \
 	done
 
 $(VENV_DIR):
diff --git a/man/oz-cleanup-cache.1 b/man/oz-cleanup-cache.1
index 98b161da..aed99a99 100644
--- a/man/oz-cleanup-cache.1
+++ b/man/oz-cleanup-cache.1
@@ -117,7 +117,7 @@ the ICICLE is generated, Oz will delete the backing file, leaving
 the original disk image pristine.
 
 .SH SEE ALSO
-oz-generate-icicle(1), oz-install(1), oz-customize(1), oz-examples(1)
+oz-generate-icicle(1), oz-install(1), oz-customize(1), oz-examples(5)
 
 .SH AUTHOR
 Chris Lalancette <clalancette@gmail.com>
diff --git a/man/oz-customize.1 b/man/oz-customize.1
index 76653ad0..27a4305a 100644
--- a/man/oz-customize.1
+++ b/man/oz-customize.1
@@ -119,7 +119,7 @@ the ICICLE is generated, Oz will delete the backing file, leaving
 the original disk image pristine.
 
 .SH SEE ALSO
-oz-generate-icicle(1), oz-install(1), oz-cleanup-cache(1), oz-examples(1)
+oz-generate-icicle(1), oz-install(1), oz-cleanup-cache(1), oz-examples(5)
 
 .SH AUTHOR
 Chris Lalancette <clalancette@gmail.com>
diff --git a/man/oz-examples.1 b/man/oz-examples.1
index 3e5522f7..157b168e 100644
--- a/man/oz-examples.1
+++ b/man/oz-examples.1
@@ -1,4 +1,4 @@
-.TH OZ-EXAMPLES 1 "July 2013" "oz-examples"
+.TH OZ-EXAMPLES 5 "July 2013" "oz-examples"
 
 .SH NAME
 oz-examples - example TDL files for Oz.
diff --git a/man/oz-generate-icicle.1 b/man/oz-generate-icicle.1
index 64c31476..4d0a7062 100644
--- a/man/oz-generate-icicle.1
+++ b/man/oz-generate-icicle.1
@@ -123,7 +123,7 @@ the ICICLE is generated, Oz will delete the backing file, leaving
 the original disk image pristine.
 
 .SH SEE ALSO
-oz-install(1), oz-customize(1), oz-cleanup-cache(1), oz-examples(1)
+oz-install(1), oz-customize(1), oz-cleanup-cache(1), oz-examples(5)
 
 .SH AUTHOR
 Chris Lalancette <clalancette@gmail.com>
diff --git a/man/oz-install.1 b/man/oz-install.1
index 2739b6ff..7dce6eb6 100644
--- a/man/oz-install.1
+++ b/man/oz-install.1
@@ -197,7 +197,7 @@ the ICICLE is generated, Oz will delete the backing file, leaving
 the original disk image pristine.
 
 .SH SEE ALSO
-oz-generate-icicle(1), oz-customize(1), oz-cleanup-cache(1), oz-examples(1)
+oz-generate-icicle(1), oz-customize(1), oz-cleanup-cache(1), oz-examples(5)
 
 .SH AUTHOR
 Chris Lalancette <clalancette@gmail.com>
diff --git a/setup.py b/setup.py
index 8ca211f2..42a982c4 100644
--- a/setup.py
+++ b/setup.py
@@ -7,8 +7,9 @@
 RELEASE = '0'
 
 datafiles = [('share/man/man1', ['man/oz-install.1', 'man/oz-generate-icicle.1',
-                                 'man/oz-customize.1', 'man/oz-examples.1',
-                                 'man/oz-cleanup-cache.1'])
+                                 'man/oz-customize.1',
+                                 'man/oz-cleanup-cache.1']),
+             ('share/man/man5', ['man/oz-examples.5'])
              ]
 
 class sdist(_sdist):