diff --git a/Lib/SimpleHTTPServer.py b/Lib/SimpleHTTPServer.py
index eac95cab96a..ea10fb7e927 100644
--- a/Lib/SimpleHTTPServer.py
+++ b/Lib/SimpleHTTPServer.py
@@ -14,6 +14,7 @@ import os
 import posixpath
 import BaseHTTPServer
 import urllib
+import urlparse
 import cgi
 import shutil
 import mimetypes
@@ -136,6 +137,8 @@ class SimpleHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         probably be diagnosed.)
 
         """
+        # abandon query parameters
+        path = urlparse.urlparse(path)[2]
         path = posixpath.normpath(urllib.unquote(path))
         words = path.split('/')
         words = filter(None, words)
diff --git a/Misc/NEWS b/Misc/NEWS
index a95774fcec9..be768d361a6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -335,6 +335,9 @@ Extension Modules
 Library
 -------
 
+- Bug #1394565: SimpleHTTPServer now doesn't choke on query paramters
+  any more.
+  
 - Bug #1403410: The warnings module now doesn't get confused
   when it can't find out the module name it generates a warning for.