diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+## 0.5.6
+
+* Added socks5 and socks5h support [#262](https://github.com/snoyberg/http-client/pull/262)
+
 ## 0.5.5
 
 * http-client should allow to log requests and responses [#248](https://github.com/snoyberg/http-client/issues/248)
diff --git a/Network/HTTP/Client/Manager.hs b/Network/HTTP/Client/Manager.hs
--- a/Network/HTTP/Client/Manager.hs
+++ b/Network/HTTP/Client/Manager.hs
@@ -509,6 +509,8 @@
             (p, muserpass) <- maybe invalid return $ do
                 uri <- case U.parseURI str of
                     Just u | U.uriScheme u == "http:" -> return u
+                           | U.uriScheme u == "socks5:" -> return u
+                           | U.uriScheme u == "socks5h:" -> return u
                     _ -> U.parseURI $ "http://" ++ str
 
                 guard $ U.uriScheme uri == "http:"
diff --git a/http-client.cabal b/http-client.cabal
--- a/http-client.cabal
+++ b/http-client.cabal
@@ -1,5 +1,5 @@
 name:                http-client
-version:             0.5.5
+version:             0.5.6
 synopsis:            An HTTP client engine
 description:         Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/http-client>.
 homepage:            https://github.com/snoyberg/http-client