Index: Lib/pydoc.py
===================================================================
--- Lib/pydoc.py	(revision 60659)
+++ Lib/pydoc.py	(working copy)
@@ -1968,7 +1968,7 @@
                     'Built-in Modules', '#ffffff', '#ee77aa', contents)]
 
                 seen = {}
-                for dir in sys.path:
+                for dir in pathdirs():
                     indices.append(html.index(dir, seen))
                 contents = heading + join(indices) + '''<p align=right>
 <font color="#909090" face="helvetica, arial"><strong>
@@ -2204,12 +2204,6 @@
     import getopt
     class BadUsage: pass
 
-    # Scripts don't get the current directory in their path by default.
-    scriptdir = os.path.dirname(sys.argv[0])
-    if scriptdir in sys.path:
-        sys.path.remove(scriptdir)
-    sys.path.insert(0, '.')
-
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'gk:p:w')
         writing = 0