diff --git a/doc/makepanda/expandimports.bat b/doc/makepanda/expandimports.bat
new file mode 100644
index 0000000000..0b7ef9de1e
--- /dev/null
+++ b/doc/makepanda/expandimports.bat
@@ -0,0 +1,26 @@
+@echo off
+
+REM
+REM Verify that we can find the 'expandimports' python script
+REM and the python interpreter.  If we can find both, then
+REM run 'expandimports'.
+REM
+
+if not exist makepanda\expandimports.py goto :missing1
+if not exist thirdparty\win-python\python.exe goto :missing2
+thirdparty\win-python\python.exe makepanda\expandimports.py %*
+goto done
+
+:missing1
+  echo You need to change directory to the root of the panda source tree
+  echo before invoking expandimports.
+  goto done
+
+:missing2
+  echo You seem to be missing the 'thirdparty' directory.  You probably checked
+  echo the source code out from sourceforge.  The sourceforge repository is
+  echo missing the 'thirdparty' directory.  You will need to supplement the
+  echo code by downloading the 'thirdparty' directory from panda3d.etc.cmu.edu
+  goto done
+
+:done
diff --git a/doc/makepanda/expandimports.py b/doc/makepanda/expandimports.py
new file mode 100644
index 0000000000..b970b3eacb
--- /dev/null
+++ b/doc/makepanda/expandimports.py
@@ -0,0 +1,21 @@
+########################################################################
+##
+## Win32 Usage: makepanda\expandimports.bat
+## Linux Usage: makepanda/expandimports.py
+##
+########################################################################
+
+import sys,os,re
+sys.path = ["direct/src/directscripts"] + sys.path
+import gendocs
+
+########################################################################
+##
+## Make sure panda has been built.
+##
+########################################################################
+
+if (os.path.isfile("built/pandac/input/libpgraph.in")==0) or (os.path.isfile("built/pandac/input/libputil.in")==0):
+    sys.exit("Cannot read the interrogate-output files in built/pandac/input")
+
+gendocs.expandImports("built/pandac/input", "direct", "direct")