diff --git a/README.markdown b/README.markdown
--- a/README.markdown
+++ b/README.markdown
@@ -2,9 +2,8 @@
 ==============
 
 An HTTP client library for Haskell using the Snap Framework's
-[io-streams](https://github.com/snapframework/io-streams) library to
-handle the streaming IO.
-<!-- replace with link to hackage when it is released -->
+[io-streams](https://hackage.haskell.org/package/io-streams) library to handle
+the streaming IO.
 
 A common case in writing RESTful web services is needing to make onward calls
 to further servers. This package is intended to make this easy to do.
diff --git a/http-streams.cabal b/http-streams.cabal
--- a/http-streams.cabal
+++ b/http-streams.cabal
@@ -1,6 +1,6 @@
-cabal-version:       >= 1.10
+cabal-version:       >= 1.24
 name:                http-streams
-version:             0.8.5.3
+version:             0.8.5.5
 synopsis:            An HTTP client using io-streams
 description:
  /Overview/
@@ -58,7 +58,7 @@
                      blaze-builder >= 0.4,
                      bytestring,
                      case-insensitive,
-                     io-streams >= 1.3 && < 1.5,
+                     io-streams >= 1.3 && < 1.6,
                      HsOpenSSL >= 0.10.3.5,
                      openssl-streams >= 1.1 && < 1.4,
                      mtl,
@@ -126,15 +126,14 @@
                      unordered-containers,
                      aeson,
                      http-common  >= 0.8.2,
-                     http-streams >= 0.8.5
+                     http-streams
 
   hs-source-dirs:    lib,tests
   main-is:           check.hs
   other-modules:     TestSuite
                      MockServer
 
-  ghc-options:       -O2
-                     -threaded
+  ghc-options:       -threaded
                      -Wall
                      -Wwarn
                      -fwarn-tabs
diff --git a/lib/Network/Http/Inconvenience.hs b/lib/Network/Http/Inconvenience.hs
--- a/lib/Network/Http/Inconvenience.hs
+++ b/lib/Network/Http/Inconvenience.hs
@@ -140,7 +140,7 @@
     was described on a Haskell Wiki page, so that makes it an officially
     supported kludge. The justification for doing this is a) the functions
     accessing this IORef are themselves all in the IO monad, and b) these
-    contortions are necessary to allow the library to be used for http:// URLs
+    contortions are necessary to allow the library to be used for https:// URLs
     *without* requiring the developer to do 'withOpenSSL'.
 -}
 global :: IORef SSLContext
@@ -190,7 +190,7 @@
     case scheme of
         "http:"  -> do
                         openConnection host port
-        "https:" -> withOpenSSL $ do
+        "https:" -> do
                         ctx <- readIORef global
                         openConnectionSSL ctx host ports
         "unix:"  -> do
@@ -233,7 +233,7 @@
     hsopenssl, but feel free to change this as appropriate for your OS.
 -}
 baselineContextSSL :: IO SSLContext
-baselineContextSSL = do
+baselineContextSSL = withOpenSSL $ do
     ctx <- SSL.context
     SSL.contextSetDefaultCiphers ctx
 #if defined __MACOSX__