diff --git a/doc/.gitignore b/doc/.gitignore
index 10d00b57..512245fb 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1 @@
-*.gz
+sandbox.rst
diff --git a/doc/conf.py b/doc/conf.py
index 1a34519e..f000ffcf 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -277,6 +277,10 @@ man_pages = [
         u'Display system-wide Qubes settings', _man_pages_author, 1),
 ]
 
+if os.path.exists('sandbox.rst'):
+    man_pages.append(('sandbox', 'sandbox',
+        u'Sandbox manpage', 'Sandbox Author', 1))
+
 # If true, show URL addresses after external links.
 #man_show_urls = False