diff --git a/doc/man/sphinx-apidoc.rst b/doc/man/sphinx-apidoc.rst
index e48102deb..f00e29d87 100644
--- a/doc/man/sphinx-apidoc.rst
+++ b/doc/man/sphinx-apidoc.rst
@@ -33,6 +33,7 @@ Options
 -T, --no-toc    Do not create a table of contents file.
 -F, --full      If given, a full Sphinx project is generated (``conf.py``,
                 ``Makefile`` etc.) using sphinx-quickstart.
+-E, --separate  Put each module file in its own page.
 
 These options are used with ``-F``:
 
diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 500332c37..9948b1cc2 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -100,9 +100,37 @@ def create_package_file(root, master_package, subroot, py_files, opts, subs):
             heading = ':mod:`%s` Package' % package
         else:
             heading = ':mod:`%s` Module' % py_file
-        text += format_heading(2, heading)
-        text += format_directive(is_package and subroot or py_path,
-                                 master_package)
+
+        # option to have each module go on its own page
+        if (opts.separatepages):
+            if (is_package):
+                # we handle packages SLIGHTLY differently in this case; no need
+                # for double nested heading for package that apidoc usually does
+                # since all other modules are going to be on separate pages
+                text += format_directive(is_package and subroot or py_path,
+                                         master_package)
+            else:
+                # with separatepages option, instead of embedding all module
+                # file contents on the one package page, each module will have
+                # its own page.
+                outfilepath = py_path + '.singlepage'
+                # text for this page just links to standalone page
+                text += '.. toctree::\n\n'
+                text += '    %s\n\n' % outfilepath
+                # and now the contents of the standalone page file is just what
+                # apidoc used to write inside this page, but with top level
+                # heading.
+                filetext = format_heading(1, heading)
+                filetext += format_directive(is_package and subroot or py_path,
+                                         master_package)
+                # write out standalone page file
+                write_file(outfilepath, filetext, opts)
+        else:
+            # standard apidoc behavior
+            text += format_heading(2, heading)
+            text += format_directive(is_package and subroot or py_path,
+                                     master_package)
+
         text += '\n'
 
     # build a list of directories that are packages (contain an INITPY file)
@@ -271,6 +299,10 @@ Note: By default this script will not overwrite already created files.""")
     parser.add_option('-R', '--doc-release', action='store', dest='release',
                       help='Project release, used when --full is given, '
                       'defaults to --doc-version')
+    parser.add_option('-E', '--separate', action='store_true', dest='separatepages',
+                      help='Put each module file in its own page, ')
+
+
 
     (opts, args) = parser.parse_args(argv[1:])