diff --git a/OpenId2/XRDS.hs b/OpenId2/XRDS.hs
--- a/OpenId2/XRDS.hs
+++ b/OpenId2/XRDS.hs
@@ -22,8 +22,8 @@
 -- Libraries
 import Control.Monad ((>=>))
 import Data.Maybe (listToMaybe)
-import Text.XML.Enumerator.Resolved (parseLBS, decodeEntities)
-import Text.XML.Enumerator.Cursor (fromDocument, element, content, ($/), (&|), Cursor, (&/), attribute)
+import Text.XML (parseLBS, def)
+import Text.XML.Cursor (fromDocument, element, content, ($/), (&|), Cursor, (&/), attribute)
 import qualified Data.ByteString.Lazy as L
 import Data.Text (Text)
 import qualified Data.Text.Read
@@ -47,7 +47,7 @@
     either
         (const Nothing)
         (Just . parseXRDS' . fromDocument)
-        (parseLBS str decodeEntities)
+        (parseLBS def str)
 
 parseXRDS' :: Cursor -> [[Service]]
 parseXRDS' = element "{xri://$xrds}XRDS" &/
diff --git a/Web/Authenticate/Rpxnow.hs b/Web/Authenticate/Rpxnow.hs
--- a/Web/Authenticate/Rpxnow.hs
+++ b/Web/Authenticate/Rpxnow.hs
@@ -40,7 +40,6 @@
 import qualified Data.Aeson.Types
 import qualified Data.Map as Map
 import Control.Applicative ((<$>), (<*>))
-import Network.TLS (TLSCertificateUsage (CertificateUsageAccept))
 
 -- | Information received from Rpxnow after a valid login.
 data Identifier = Identifier
@@ -63,21 +62,15 @@
             , "&token="
             , S.pack token
             ]
+    req' <- parseUrl "https://rpxnow.com"
     let req =
-            Request
+            req'
                 { method = "POST"
-                , secure = True
-                , host = "rpxnow.com"
-                , port = 443
                 , path = "api/v2/auth_info"
-                , queryString = []
                 , requestHeaders =
                     [ ("Content-Type", "application/x-www-form-urlencoded")
                     ]
                 , requestBody = RequestBodyLBS body
-                , checkCerts = const $ return CertificateUsageAccept
-                , proxy = Nothing
-                , rawBody = False
                 }
     res <- liftIO $ withManager $ httpLbsRedirect req
     let b = responseBody res
diff --git a/authenticate.cabal b/authenticate.cabal
--- a/authenticate.cabal
+++ b/authenticate.cabal
@@ -1,5 +1,5 @@
 name:            authenticate
-version:         0.10.1
+version:         0.10.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Hiromi Ishii, Arash Rouhani
@@ -16,7 +16,7 @@
 library
     build-depends:   base >= 4 && < 5,
                      aeson-native >= 0.3.2.11 && < 0.4,
-                     http-enumerator >= 0.6.5.4 && < 0.7,
+                     http-enumerator >= 0.6.5.4 && < 0.8,
                      tagsoup >= 0.12 && < 0.13,
                      failure >= 0.0.0 && < 0.2,
                      transformers >= 0.1 && < 0.3,
@@ -31,7 +31,7 @@
                      text >= 0.5 && < 1.0,
                      http-types >= 0.6 && < 0.7,
                      enumerator >= 0.4.7 && < 0.5,
-                     xml-enumerator >= 0.3.4 && < 0.4,
+                     xml-enumerator >= 0.4 && < 0.5,
                      blaze-builder >= 0.2 && < 0.4,
                      attoparsec >= 0.9   && < 0.10,
                      tls >= 0.7 && < 0.8,