diff --git a/examples/echoclient/echoclient.cabal b/examples/echoclient/echoclient.cabal
--- a/examples/echoclient/echoclient.cabal
+++ b/examples/echoclient/echoclient.cabal
@@ -9,7 +9,6 @@
 Build-Type:     Simple
 License:        OtherLicense
 Copyright:      Mahdi Abdinejadi, Jon Kristensen, Philipp Balzarek
-Maintainer:     info@jonkri.com
 Synopsis:       Echo client test program for Pontarius XMPP
 
 Executable echoclient
diff --git a/pontarius-xmpp.cabal b/pontarius-xmpp.cabal
--- a/pontarius-xmpp.cabal
+++ b/pontarius-xmpp.cabal
@@ -1,5 +1,5 @@
 Name:          pontarius-xmpp
-Version:       0.5.6.1
+Version:       0.5.6.2
 Cabal-Version: >= 1.10
 Build-Type:    Custom
 License:       BSD3
@@ -55,7 +55,7 @@
                , exceptions           >=0.6
                , hslogger             >=1.1.0
                , iproute              >=1.2.4
-               , lens-family
+               , lens-family          < 1.3
                , lifted-base          >=0.1.0.1
                , mtl                  >=2.0.0.0
                , network              >=2.3.1.0
@@ -226,4 +226,4 @@
 Source-Repository this
   Type: git
   Location: https://github.com/l29ah/pontarius-xmpp.git
-  Tag: 0.5.6.1
+  Tag: 0.5.6.2
diff --git a/source/Network/Xmpp.hs b/source/Network/Xmpp.hs
--- a/source/Network/Xmpp.hs
+++ b/source/Network/Xmpp.hs
@@ -1,7 +1,6 @@
 -- |
 -- Module:      $Header$
 --
--- Maintainer:  info@jonkri.com
 -- Stability:   unstable
 -- Portability: portable
 --
diff --git a/source/Network/Xmpp/Internal.hs b/source/Network/Xmpp/Internal.hs
--- a/source/Network/Xmpp/Internal.hs
+++ b/source/Network/Xmpp/Internal.hs
@@ -1,7 +1,6 @@
 -- |
 -- Module:      $Header$
 --
--- Maintainer:  info@jonkri.com
 -- Stability:   unstable
 -- Portability: portable
 --
diff --git a/source/Network/Xmpp/Stream.hs b/source/Network/Xmpp/Stream.hs
--- a/source/Network/Xmpp/Stream.hs
+++ b/source/Network/Xmpp/Stream.hs
@@ -281,7 +281,7 @@
 -- We buffer sources because we don't want to lose data when multiple
 -- xml-entities are sent with the same packet and we don't want to eternally
 -- block the StreamState while waiting for data to arrive
-bufferSrc :: Source (ExceptT XmppFailure IO) o
+bufferSrc :: ConduitT () o (ExceptT XmppFailure IO) ()
           -> IO (ConduitM i o (ExceptT XmppFailure IO) ())
 bufferSrc src = do
     ref <- newTMVarIO $ DCI.sealConduitT src
@@ -455,7 +455,7 @@
 
 -- `Connect-and-resumes' the given sink to the stream source, and pulls a
 -- `b' value.
-runEventsSink :: Sink Event (ExceptT XmppFailure IO) b
+runEventsSink :: ConduitT Event Void (ExceptT XmppFailure IO) b
               -> StateT StreamState IO (Either XmppFailure b)
 runEventsSink snk = do -- TODO: Wrap exceptions?
     src <- gets streamEventSource
@@ -543,7 +543,7 @@
     , streamConfiguration = def
     }
 
-zeroSource :: Source (ExceptT XmppFailure IO) a
+zeroSource :: ConduitT () a (ExceptT XmppFailure IO) ()
 zeroSource = do
     liftIO $ debugM "Pontarius.Xmpp" "zeroSource"
     throwError XmppNoStream
@@ -587,7 +587,7 @@
             lift $ debugM "Pontarius.Xmpp" "Did not acquire handle."
             throwError TcpConnectionFailure
   where
-    logConduit :: MonadIO m => Conduit ByteString m ByteString
+    logConduit :: MonadIO m => ConduitT ByteString ByteString m ()
     logConduit = CL.mapM $ \d -> do
         liftIO . debugM "Pontarius.Xmpp" $ "In: " ++ (BSC8.unpack d) ++
             "."
@@ -835,7 +835,7 @@
             yield s
         Nothing -> return ()
 
-elements :: MonadError XmppFailure m => Conduit Event m Element
+elements :: MonadError XmppFailure m => ConduitT Event Element m ()
 elements = do
         x <- await
         case x of
diff --git a/source/Network/Xmpp/Tls.hs b/source/Network/Xmpp/Tls.hs
--- a/source/Network/Xmpp/Tls.hs
+++ b/source/Network/Xmpp/Tls.hs
@@ -116,8 +116,8 @@
 tlsinit :: (MonadIO m, MonadIO m1) =>
         ClientParams
      -> Backend
-     -> m ( Source m1 BS.ByteString
-          , Sink BS.ByteString m1 ()
+     -> m ( ConduitT () BS.ByteString m1 ()
+          , ConduitT BS.ByteString Void m1 ()
           , BS.ByteString -> IO ()
           , Int -> m1 BS.ByteString
           , Context
diff --git a/source/Network/Xmpp/Types.hs b/source/Network/Xmpp/Types.hs
--- a/source/Network/Xmpp/Types.hs
+++ b/source/Network/Xmpp/Types.hs
@@ -791,7 +791,7 @@
       -- | Functions to send, receive, flush, and close the stream
     , streamHandle :: StreamHandle
       -- | Event conduit source, and its associated finalizer
-    , streamEventSource :: Source (ExceptT XmppFailure IO) Event
+    , streamEventSource :: ConduitT () Event (ExceptT XmppFailure IO) ()
       -- | Stream features advertised by the server
     , streamFeatures :: !StreamFeatures -- TODO: Maybe?
       -- | The hostname or IP specified for the connection
@@ -1276,10 +1276,11 @@
                         }
 
 -- | Default parameters for TLS
+-- @ciphersuite_all@ can be used to allow insecure ciphers
 xmppDefaultParams :: ClientParams
 xmppDefaultParams = (defaultParamsClient "" BS.empty)
                         { clientSupported = def
-                            { supportedCiphers = ciphersuite_all
+                            { supportedCiphers = ciphersuite_default
                             }
                         }