diff --git a/pontarius-xmpp.cabal b/pontarius-xmpp.cabal
--- a/pontarius-xmpp.cabal
+++ b/pontarius-xmpp.cabal
@@ -1,6 +1,6 @@
 Cabal-Version: 2.2
 Name:          pontarius-xmpp
-Version:       0.5.6.6
+Version:       0.5.6.7
 Build-Type:    Simple
 License:       BSD-3-Clause
 License-File:  LICENSE.md
@@ -17,7 +17,7 @@
                While in alpha, Pontarius XMPP works quite well and fulfills most
                requirements of the RFCs.
 Category:      Network
-Tested-With:   GHC == 9.2.7
+Tested-With:   GHC == 9.6.2
 
 Extra-Source-Files: README.md
                   , ChangeLog.md
@@ -41,7 +41,6 @@
                , conduit              >=1.3 && < 1.4
                , containers           >=0.4.0.0
                , crypto-api           >=0.9
-               , cryptonite           >=0.30 && < 1.0
                , cryptohash           >=0.6.1
                , cryptohash-cryptoapi >=0.1
                , data-default         >=0.2
@@ -66,7 +65,7 @@
                , transformers         >=0.3
                , unbounded-delays     >=0.1
                , void                 >=0.5.5
-               , x509-system          >=1.4
+               , crypton-x509-system  >=1.4
                , xml-conduit          >=1.1.0.7
                , xml-picklers         >=0.3.3
                , xml-types            >=0.3.1
@@ -215,4 +214,4 @@
 Source-Repository this
   Type: git
   Location: https://github.com/l29ah/pontarius-xmpp.git
-  Tag: 0.5.6.6
+  Tag: 0.5.6.7
diff --git a/source/Network/Xmpp/Concurrent/Threads.hs b/source/Network/Xmpp/Concurrent/Threads.hs
--- a/source/Network/Xmpp/Concurrent/Threads.hs
+++ b/source/Network/Xmpp/Concurrent/Threads.hs
@@ -10,6 +10,7 @@
 import qualified Control.Exception.Lifted as Ex
 import           Control.Monad
 import           Control.Monad.Except
+import           Control.Monad.IO.Class
 import qualified Data.ByteString as BS
 import           GHC.IO (unsafeUnmask)
 import           Network.Xmpp.Concurrent.Types
diff --git a/source/Network/Xmpp/Sasl/Common.hs b/source/Network/Xmpp/Sasl/Common.hs
--- a/source/Network/Xmpp/Sasl/Common.hs
+++ b/source/Network/Xmpp/Sasl/Common.hs
@@ -6,6 +6,7 @@
 module Network.Xmpp.Sasl.Common where
 
 import           Control.Applicative ((<$>))
+import           Control.Monad
 import           Control.Monad.Except
 import qualified Data.Attoparsec.ByteString.Char8 as AP
 import           Data.Bits
diff --git a/source/Network/Xmpp/Sasl/Mechanisms/Scram.hs b/source/Network/Xmpp/Sasl/Mechanisms/Scram.hs
--- a/source/Network/Xmpp/Sasl/Mechanisms/Scram.hs
+++ b/source/Network/Xmpp/Sasl/Mechanisms/Scram.hs
@@ -7,6 +7,7 @@
   where
 
 import           Control.Applicative ((<$>))
+import           Control.Monad
 import           Control.Monad.Except
 import           Control.Monad.State.Strict
 import qualified Crypto.Classes          as Crypto
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
@@ -90,6 +90,7 @@
 import           Control.Applicative ((<$>), (<|>), many)
 import           Control.Concurrent.STM
 import           Control.Exception
+import           Control.Monad
 import           Control.Monad.Except
 import qualified Data.Attoparsec.Text as AP
 import qualified Data.ByteString as BS