diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 6131986e545..3ec564eec07 100644
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -2451,7 +2451,7 @@ end
 item: Create Shortcut
   Source=%MAINDIR%\pythonw.exe
   Destination=%GROUP%\Module Docs.lnk
-  Command Options="%MAINDIR%\Tools\Scripts\pydoc.pyw"
+  Command Options="%MAINDIR%\Tools\Scripts\pydocgui.pyw"
   Working Directory=%MAINDIR%
   Key Type=1536
   Flags=00000001
diff --git a/Tools/scripts/pydoc.pyw b/Tools/scripts/pydoc.pyw
deleted file mode 100755
index 66992f999a8..00000000000
--- a/Tools/scripts/pydoc.pyw
+++ /dev/null
@@ -1,2 +0,0 @@
-import pydoc
-pydoc.gui()
diff --git a/Tools/scripts/pydocgui.pyw b/Tools/scripts/pydocgui.pyw
new file mode 100644
index 00000000000..61a8b89f41f
--- /dev/null
+++ b/Tools/scripts/pydocgui.pyw
@@ -0,0 +1,5 @@
+# Note:  this file must not be named pydoc.pyw, lest it just end up
+# importing itself (Python began allowing import of .pyw files
+# between 2.2a1 and 2.2a2).
+import pydoc
+pydoc.gui()