diff --git a/HaskellNet-SSL.cabal b/HaskellNet-SSL.cabal
index 88c245d..86d6529 100644
--- a/HaskellNet-SSL.cabal
+++ b/HaskellNet-SSL.cabal
@@ -1,6 +1,6 @@
 name:                HaskellNet-SSL
 synopsis:            Helpers to connect to SSL/TLS mail servers with HaskellNet
-version:             0.3.4.1
+version:             0.3.4.2
 description:         This package ties together the HaskellNet and connection
                      packages to make it easy to open IMAP and SMTP connections
                      over SSL.
@@ -15,10 +15,14 @@ build-type:          Simple
 cabal-version:       >=1.8
 data-files:          README.md
 
-Flag NoUpperBounds
+flag NoUpperBounds
   Description: Removes upper bounds from all packages
   Default: False
 
+flag network-bsd
+   description: Get Network.BSD from the network-bsd package
+   default: True
+
 source-repository head
   type:     git
   location: git://github.com/dpwright/HaskellNet-SSL.git
@@ -36,14 +40,17 @@ library
                        HaskellNet >= 0.3,
                        tls >= 1.2,
                        connection >= 0.2.7,
-                       network >= 2.4,
                        bytestring,
                        data-default
   else
     build-depends:     base >= 4 && < 5,
                        HaskellNet >= 0.3 && < 0.6,
-                       tls >= 1.2 && < 1.5,
-                       connection >= 0.2.7 && < 0.3,
-                       network >= 2.4 && < 2.9,
+                       tls >= 1.2 && < 1.6,
+                       connection >= 0.2.7 && < 0.4,
                        bytestring,
                        data-default
+  if flag(network-bsd)
+    build-depends:     network >= 3.0,
+                       network-bsd >= 2.7
+  else
+    build-depends:     network >= 2.4 && < 3.0
diff --git a/src/Network/HaskellNet/SSL.hs b/src/Network/HaskellNet/SSL.hs
index acb9b84..cb5e613 100644
--- a/src/Network/HaskellNet/SSL.hs
+++ b/src/Network/HaskellNet/SSL.hs
@@ -1,9 +1,14 @@
+{-# LANGUAGE CPP #-}
 module Network.HaskellNet.SSL
   ( Settings (..)
   , defaultSettingsWithPort
   ) where
 
+#if MIN_VERSION_network(3,0,0)
+import Network.Socket (PortNumber)
+#else
 import Network.Socket.Internal (PortNumber)
+#endif
 
 data Settings = Settings
               { sslPort                        :: PortNumber