diff --git a/wxPython/distrib/README.dbg.txt b/wxPython/distrib/README.dbg.txt
index b2289512b3..ba829d4443 100644
--- a/wxPython/distrib/README.dbg.txt
+++ b/wxPython/distrib/README.dbg.txt
@@ -10,11 +10,21 @@ Another debugging feature is when the wxPython program exits, it will
 print to stdout information about any wxWindows C++ objects that
 havn't been properly cleaned up.
 
-This archive contains a new wxWindows DLL named wx[version]d.dll that
-should be copied to the windows system directory or some other
-directory on the PATH.You will also find replacements for all of
-wxPython's *.pyd files that are linked to use this DLL.  Until I put
-together a new installer, you'll need to copy things manually.
+This archive contains a new wxWindows DLL named wx[version]d.dll and a
+debugging version of the core wxPython module, wxc_d.pyd.  These
+should be put into your wxPython package directory.  Also included are
+the debuging version of Python, python_d.exe and python[VER]_d.dll
+which can be put wherever you like.
+
+In order to run the debugging version of wxPython sumply run you
+program with python_d.exe instead of python.exe.  This lets the
+debugging version sit side by side with the production version, with
+no need for swapping this around.  You will also need _d versions of
+any other extension modules you are using.  If you need _d's for any
+of the other standard Python extensions you can get them here, for 2.0
+at least:
+
+http://www.pythonlabs.com/products/python2.0/downloads/BeOpen-Python-2.0-Debug.zip
 
 
 Robin
diff --git a/wxPython/distrib/makedbg.bat b/wxPython/distrib/makedbg.bat
index f4618328df..f738789ffa 100755
--- a/wxPython/distrib/makedbg.bat
+++ b/wxPython/distrib/makedbg.bat
@@ -2,13 +2,32 @@
 rem Builds a zip containing debugging versions of wxWindows and wxPython
 rem that could be unziped over a wxPython installation.
 
+setlocal
+
+iff "%1" == "15" then
+	set PCBUILD=c:\projects\Python-1.5.2\PCBuild
+elseiff "%1" == "20" then
+	set PCBUILD=c:\projects\Python-2.0\PCBuild
+else
+	echo Specivy Python version!!!
+	goto end
+endiff
+
+iff "%2" == "" then
+	echo Specify wxPython version!!!
+	goto end
+endiff
+
 
 mkdir wxPython-dbg
 copy README.dbg.txt wxPython-dbg
 copy %WXWIN%\lib\wx*d.dll wxPython-dbg
-copy %WXWIN%\wxPython\wxPython\*.pyd wxPython-dbg
+copy %WXWIN%\wxPython\wxPython\*_d.pyd wxPython-dbg
+copy %PCBUILD%\python_d.exe wxPython-dbg
+copy %PCBUILD%\python%1_d.dll wxPython-dbg
 
-zip -r wxPython-dbg-%1.zip wxPython-dbg
+zip -r wxPython-dbg-%2-Py%1.zip wxPython-dbg
 
 del /sx wxPython-dbg
 
+:end
\ No newline at end of file
diff --git a/wxPython/src/.cvsignore b/wxPython/src/.cvsignore
index ac49f58934..71b0afd835 100644
--- a/wxPython/src/.cvsignore
+++ b/wxPython/src/.cvsignore
@@ -7,6 +7,7 @@ Setup.save
 Setup.save
 Setup.test
 _make.bat
+b.bat
 build.local
 compile.py
 config.c