diff --git a/Network/HTTP/Enumerator.hs b/Network/HTTP/Enumerator.hs
--- a/Network/HTTP/Enumerator.hs
+++ b/Network/HTTP/Enumerator.hs
@@ -678,9 +678,11 @@
         , port = port'
         , secure = sec
         , path = S8.pack
-                    $ if null path''
+                    $ (if null path'
                             then "/"
-                            else concatMap (encodeUrlCharPI parsePath) path''
+                            else concatMap (encodeUrlCharPI parsePath) path')
+                        ++
+                      (if parsePath then "" else qstring')
         , queryString = if parsePath
                             then W.parseQuery $ S8.pack qstring
                             else []
@@ -689,7 +691,6 @@
     (beforeSlash, afterSlash) = break (== '/') s
     (hostname, portStr) = break (== ':') beforeSlash
     (path', qstring') = break (== '?') afterSlash
-    path'' = if parsePath then path' else afterSlash
     qstring'' = case qstring' of
                 '?':x -> x
                 _ -> qstring'
diff --git a/http-enumerator.cabal b/http-enumerator.cabal
--- a/http-enumerator.cabal
+++ b/http-enumerator.cabal
@@ -1,5 +1,5 @@
 name:            http-enumerator
-version:         0.7.2.2
+version:         0.7.2.3
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -7,8 +7,6 @@
 synopsis:        HTTP client package with enumerator interface and HTTPS support.
 description:
     This package uses attoparsec for parsing the actual contents of the HTTP connection. It also provides higher-level functions which allow you to avoid direct usage of enumerators.
-    .
-    Note that this package has been superceded by http-conduit. If you are not using the enumerator interface of this package at all, it is highly recommended to switch to http-conduit. If you are using enumerators, please consider making the move to http-conduit anyway, as it solves some socket leaks that cannot be addressed with enumerators.
 category:        Web, Enumerator
 stability:       Stable
 cabal-version:   >= 1.6
