Index: SConstruct
===================================================================
--- SConstruct	(revision 17112)
+++ SConstruct	(working copy)
@@ -562,3 +562,6 @@
 #------------ EPYDOC
 # TODO: run epydoc
 
+if env['WITH_BF_BPYDOC']:
+    SConscript(['source/blender/python/api2_2x/doc/SConscript'])
+
Index: source/blender/python/api2_2x/doc/SConscript
===================================================================
--- source/blender/python/api2_2x/doc/SConscript	(revision 0)
+++ source/blender/python/api2_2x/doc/SConscript	(revision 0)
@@ -0,0 +1,30 @@
+#!/usr/bin/python
+Import ('env')
+
+
+from optparse import OptionParser
+try:
+    import epydoc
+except ImportError:
+    print "No epydoc install detected, Python API Docs will not be generated "
+if epydoc:
+    from epydoc.docbuilder import build_doc_index
+    from epydoc import cli
+    #names = glob.glob(os.sep.join(("source","blender","python","api2_2x","doc[A-Z]*.py")))
+    names = env.Glob("source/blender/python/api2_2x/doc/[A-Z]*.py")
+    #print names
+    docindex = build_doc_index(names)
+    optvalues = cli.OPTION_DEFAULTS
+    optvalues["verbose"] = 1
+    optvalues["target"] = env["BF_BUILDDIR"]+"/BPY_API/"
+    optvalues["url"] = "http://www.blender.org"
+    optvalues["top"] = "API_intro"
+    optvalues["name"] = "Blender"
+    optvalues["noprivate"] = 1
+    optvalues["noframes"] = 1
+    optvalues["names"] = names
+    optparser = OptionParser()
+    optparser.set_defaults(**optvalues)
+    (options, args) = optparser.parse_args()
+    cli.write_html(docindex, options)
+
Index: tools/btools.py
===================================================================
--- tools/btools.py	(revision 17112)
+++ tools/btools.py	(working copy)
@@ -67,6 +67,7 @@
             'BF_FANCY', 'BF_QUIET',
             'BF_X264_CONFIG',
             'BF_XVIDCORE_CONFIG',
+            'WITH_BF_BPYDOC',
             ]
 
     arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
@@ -348,6 +349,7 @@
 
         ('BF_X264_CONFIG', 'configuration flags for x264', ''),
         ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''),
+        (BoolOption('WITH_BF_BPYDOC', 'Generate BPY API documentation', 'false')),
         
         ('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'),