diff --git a/Tools/pynche/Main.py b/Tools/pynche/Main.py
index bbf5533881b..b86bea235da 100644
--- a/Tools/pynche/Main.py
+++ b/Tools/pynche/Main.py
@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 """Pynche: The PYthon Natural Color and Hue Editor.
 
 Pynche is based largely on a similar color editor I wrote years ago for the
diff --git a/Tools/pynche/PyncheWidget.py b/Tools/pynche/PyncheWidget.py
index 1cdf3981e21..e3a3b2cb603 100644
--- a/Tools/pynche/PyncheWidget.py
+++ b/Tools/pynche/PyncheWidget.py
@@ -101,7 +101,7 @@ class PyncheWidget:
         return self.__root
 
     def __popup_about(self, event=None):
-        from pynche import __version__
+        from Main import __version__
         tkMessageBox.showinfo('About Pynche ' + __version__,
                               '''\
 Pynche %s
diff --git a/Tools/pynche/README b/Tools/pynche/README
index 17758841003..2950d900de8 100644
--- a/Tools/pynche/README
+++ b/Tools/pynche/README
@@ -25,8 +25,7 @@ this reason, but you can use a different file with the -d option.  The
 file xlicense.txt contains the license only for rgb.txt.
 
 Pynche is pronounced `Pinch-ee'.  Start it by running the pynche.py
-driver.  On Windows, you probably want to rename pynche.py to
-pynche.pyw so that it doesn't bring up a console window.
+driver.  On Windows, run pynche.pyw to inhibit the console window.
 
 The top part of the main Pynche window contains the "variation
 strips".  Each strip contains a number of "color chips".  The strips
diff --git a/Tools/pynche/pynche b/Tools/pynche/pynche
new file mode 100755
index 00000000000..64bf70335db
--- /dev/null
+++ b/Tools/pynche/pynche
@@ -0,0 +1,7 @@
+#! /usr/bin/env python
+
+"""Run this file under Unix, or when debugging under Windows.
+Run the file pynche.pyw under Windows to inhibit the console window.
+"""
+import Main
+Main.main()
diff --git a/Tools/pynche/pynche.pyw b/Tools/pynche/pynche.pyw
new file mode 100755
index 00000000000..6dfc8fed715
--- /dev/null
+++ b/Tools/pynche/pynche.pyw
@@ -0,0 +1,7 @@
+#! /usr/bin/env python
+
+"""Run this file under Windows to inhibit the console window.
+Run the file pynche.py under Unix or when debugging under Windows.
+"""
+import Main
+Main.main()