diff --git a/wxPython/scripts/helpviewer b/wxPython/scripts/helpviewer
new file mode 100755
index 0000000000..c31cc70a15
--- /dev/null
+++ b/wxPython/scripts/helpviewer
@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+
+from wxPython.tools.helpviewer import main
+main()
diff --git a/wxPython/wxPython/tools/helpviewer.py b/wxPython/wxPython/tools/helpviewer.py
new file mode 100644
index 0000000000..95810c66df
--- /dev/null
+++ b/wxPython/wxPython/tools/helpviewer.py
@@ -0,0 +1,78 @@
+#----------------------------------------------------------------------
+# Name:        wxPython.tools.helpviewer
+# Purpose:     HTML Help viewer
+#
+# Author:      Robin Dunn
+#
+# Created:     11-Dec-2002
+# RCS-ID:      $Id$
+# Copyright:   (c) 2002 by Total Control Software
+# Licence:     wxWindows license
+#----------------------------------------------------------------------
+
+"""
+helpviewer.py   --  Displays HTML Help in a wxHtmlHelpController window.
+
+Usage:
+    helpviewer [--cache=path] helpfile [helpfile(s)...]
+
+    Where helpfile is the path to either a .hhp file or a .zip file
+    which contians a .hhp file.  The .hhp files are the same as those
+    used by Microsoft's HTML Help Workshop for creating CHM files.
+"""
+
+
+import sys, os
+
+#---------------------------------------------------------------------------
+
+def main():
+    if len(sys.argv) < 2:
+        print __doc__
+        return
+
+    args = sys.argv[1:]
+    cachdir = None
+    if args[0][:7] == '--cache':
+        cachedir = os.path.expanduser(args[0].split('=')[1])
+        args = args[1:]
+
+    if len(args) == 0:
+        print __doc__
+        return
+
+    from wxPython.wx import wxPySimpleApp, wxConfigBase_Get, \
+         wxLog_SetActiveTarget, wxLogStderr, \
+         wxFileSystem_AddHandler, wxZipFSHandler
+    import wxPython.html
+    from wxPython.htmlhelp import wxHtmlHelpController
+
+
+    app = wxPySimpleApp()
+    wxLog_SetActiveTarget(wxLogStderr())
+
+    # Set up the default config so the htmlhelp frame can save its preferences
+    app.SetVendorName('wxWindows')
+    app.SetAppName('helpviewer')
+    cfg = wxConfigBase_Get()
+
+    # Add the Zip filesystem
+    wxFileSystem_AddHandler(wxZipFSHandler())
+
+    # Create the viewer
+    helpctrl = wxHtmlHelpController()
+    if cachedir:
+        helpctrl.SetTempDir(cachedir)
+
+    # and add the books
+    for helpfile in args:
+        print "Adding %s..." % helpfile
+        helpctrl.AddBook(helpfile, 1)
+
+    # start it up!
+    helpctrl.DisplayContents()
+    app.MainLoop()
+
+
+if __name__ == '__main__':
+    main()