diff --git a/src/IRC/Types.hs b/src/IRC/Types.hs
--- a/src/IRC/Types.hs
+++ b/src/IRC/Types.hs
@@ -4,12 +4,17 @@
   , Nickname
   , Password
   , Hook(..)
+  , addHandler'
 ) where
 
-import           Data.ByteString.Char8 (ByteString)
-import           Data.CaseInsensitive  (CI)
-import qualified Data.Text             as T (Text)
-import           Network.IRC.Client    (EventHandler, StatefulIRC)
+import           Control.Concurrent.STM      (atomically)
+import           Control.Concurrent.STM.TVar (readTVar, writeTVar)
+import           Control.Monad.IO.Class      (liftIO)
+import           Data.ByteString.Char8       (ByteString)
+import           Data.CaseInsensitive        (CI)
+import qualified Data.Text                   as T (Text)
+import           Network.IRC.Client          (EventHandler, InstanceConfig (..),
+                                              StatefulIRC, instanceConfigTVar)
 
 type Network  = ByteString
 type Channel  = CI T.Text
@@ -20,3 +25,13 @@
                    , events       :: [EventHandler s]
                    , onDisconnect :: StatefulIRC s ()
                    }
+
+-- TODO Remove when https://github.com/barrucadu/irc-client/pull/19 is merged.
+-- | Add an event handler
+addHandler' :: EventHandler s -> StatefulIRC s ()
+addHandler' handler = do
+    tvarI <- instanceConfigTVar
+
+    liftIO . atomically $  do
+        iconf <- readTVar tvarI
+        writeTVar tvarI iconf { _eventHandlers = handler : _eventHandlers iconf }
diff --git a/src/XDCC.hs b/src/XDCC.hs
--- a/src/XDCC.hs
+++ b/src/XDCC.hs
@@ -45,7 +45,7 @@
     liftIO . atomically . modifyTVar state $ \s -> s { xdccStatus = newS }
 
 addDccHandler :: IRC.EventHandler Stati -> XdccIO ()
-addDccHandler = XdccIO . IRC.addHandler
+addDccHandler = XdccIO . addHandler'
 
 sendXdcc :: XdccCommand a => Nickname -> a -> XdccIO ()
 sendXdcc nick = XdccIO . IRC.send . IRC.Privmsg nick . Right . toText
diff --git a/src/ZNC.hs b/src/ZNC.hs
--- a/src/ZNC.hs
+++ b/src/ZNC.hs
@@ -15,8 +15,10 @@
    host == "znc.in"
    user == "znc"
 -}
+pattern ZncStatusUser :: Source T.Text
 pattern ZncStatusUser = User "*status"
 
+pattern ZncDisconnectedMsg :: T.Text -> Message T.Text
 pattern ZncDisconnectedMsg target =
     Privmsg target (Right
         "You are currently disconnected from IRC. Use 'connect' to reconnect.")
diff --git a/xdcc.cabal b/xdcc.cabal
--- a/xdcc.cabal
+++ b/xdcc.cabal
@@ -1,5 +1,5 @@
 name:                 xdcc
-version:              1.1.1
+version:              1.1.2
 synopsis:             A wget-like utility for retrieving files from XDCC bots on
                       IRC
 description:          XDCC (eXtended DCC) is a protocol used by IRC bots to make