diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2023-07-09 Laurent P. René de Cotret <laurent.decotret@outlook.com> 0.8.4
+2024-09-03 Laurent P. René de Cotret <laurent.decotret@outlook.com> 0.8.5
+
+* Bumped dependency bounds to support GHC 8.10.7 - GHC 9.10.1
+* Updated links to point to Distributed Haskell monorepo
+
+2024-07-09 Laurent P. René de Cotret <laurent.decotret@outlook.com> 0.8.4
 
 * Set TCP_NODELAY by default. The documentation erroneously reported it as the default. (#66)
 
diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
--- a/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/network-transport-tcp.cabal b/network-transport-tcp.cabal
--- a/network-transport-tcp.cabal
+++ b/network-transport-tcp.cabal
@@ -1,36 +1,48 @@
+cabal-version: 3.0
 Name:          network-transport-tcp
-Version:       0.8.4
-Cabal-Version: >=1.10
+Version:       0.8.5
 Build-Type:    Simple
-License:       BSD3
+License:       BSD-3-Clause
 License-file:  LICENSE
 Copyright:     Well-Typed LLP, Tweag I/O Limited
 Author:        Duncan Coutts, Nicolas Wu, Edsko de Vries
-maintainer:    Facundo Domínguez <facundo.dominguez@tweag.io>
+maintainer:    The Distributed Haskell team
 Stability:     experimental
 Homepage:      http://haskell-distributed.github.com
-Bug-Reports:   https://github.com/haskell-distributed/network-transport-tcp/issues
+Bug-Reports:   https://github.com/haskell-distributed/distributed-process/issues
 Synopsis:      TCP instantiation of Network.Transport
-Description:   TCP instantiation of Network.Transport
-Tested-With:   GHC==9.0.2 GHC==9.2.8 GHC==9.4.5 GHC==9.6.4 GHC==9.8.2
+Description:   TCP instantiation of Network.Transport, which can be used to create Cloud Haskell backends
+tested-with:   GHC==8.10.7 GHC==9.0.2 GHC==9.2.8 GHC==9.4.5 GHC==9.6.4 GHC==9.8.2 GHC==9.10.1
 Category:      Network
-extra-source-files: ChangeLog
+extra-doc-files: ChangeLog
 
-Source-Repository head
+source-repository head
   Type:     git
-  Location: https://github.com/haskell-distributed/network-transport-tcp
+  Location: https://github.com/haskell-distributed/distributed-process
+  SubDir:   packages/network-transport-tcp
 
+common warnings
+    ghc-options: -Wall
+                 -Wcompat
+                 -Widentities
+                 -Wincomplete-uni-patterns
+                 -Wincomplete-record-updates
+                 -Wredundant-constraints
+                 -fhide-source-paths
+                 -Wpartial-fields
+
 Flag use-mock-network
   Description:     Use mock network implementation (for testing)
   Default:         False
 
 Library
-  Build-Depends:   base >= 4.3 && < 5,
+  import:          warnings
+  Build-Depends:   base >= 4.14 && < 5,
                    async >= 2.2 && < 2.3,
                    network-transport >= 0.5 && < 0.6,
                    data-accessor >= 0.2 && < 0.3,
-                   containers >= 0.4 && < 0.7,
-                   bytestring >= 0.9 && < 0.13,
+                   containers >= 0.6 && < 0.8,
+                   bytestring >= 0.10 && < 0.13,
                    network >= 3.1 && < 3.3,
                    uuid >= 1.3 && < 1.4
   Exposed-modules: Network.Transport.TCP,
@@ -38,7 +50,7 @@
   Default-Extensions: CPP
   default-language: Haskell2010
   Other-Extensions:   RecursiveDo
-  ghc-options:     -Wall -fno-warn-unused-do-bind
+  ghc-options:     -fno-warn-unused-do-bind
   HS-Source-Dirs:  src
   If flag(use-mock-network)
     CPP-Options:     -DUSE_MOCK_NETWORK
@@ -46,10 +58,11 @@
                      Network.Transport.TCP.Mock.Socket.ByteString
 
 Test-Suite TestTCP
+  import:          warnings
   Type:            exitcode-stdio-1.0
   Main-Is:         TestTCP.hs
-  Build-Depends:   base >= 4.3 && < 5,
-                   bytestring >= 0.9,
+  Build-Depends:   base >= 4.14 && < 5,
+                   bytestring >= 0.10,
                    network-transport-tests >= 0.3 && < 0.4,
                    network >= 3.1,
                    network-transport,
@@ -63,10 +76,11 @@
     CPP-Options:   -DUSE_MOCK_NETWORK
 
 Test-Suite TestQC
+  import:         warnings
   Type:           exitcode-stdio-1.0
   Main-Is:        TestQC.hs
   If flag(use-mock-network)
-    Build-Depends:  base >= 4.3 && < 5,
+    Build-Depends:  base >= 4.14 && < 5,
                     test-framework,
                     test-framework-quickcheck2,
                     test-framework-hunit,
diff --git a/src/Network/Transport/TCP.hs b/src/Network/Transport/TCP.hs
--- a/src/Network/Transport/TCP.hs
+++ b/src/Network/Transport/TCP.hs
@@ -10,7 +10,7 @@
 -- Applications that use the TCP transport should use
 -- 'Network.Socket.withSocketsDo' in their main function for Windows
 -- compatibility (see "Network.Socket").
-
+{-# LANGUAGE CPP  #-}
 {-# LANGUAGE RecursiveDo #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE RankNTypes #-}
@@ -43,9 +43,6 @@
 
 import Prelude hiding
   ( mapM_
-#if ! MIN_VERSION_base(4,6,0)
-  , catch
-#endif
   )
 
 import Network.Transport
diff --git a/src/Network/Transport/TCP/Internal.hs b/src/Network/Transport/TCP/Internal.hs
--- a/src/Network/Transport/TCP/Internal.hs
+++ b/src/Network/Transport/TCP/Internal.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP  #-}
 -- | Utility functions for TCP sockets
 module Network.Transport.TCP.Internal
   ( ControlHeader(..)
@@ -21,10 +22,6 @@
   , ProtocolVersion
   , currentProtocolVersion
   ) where
-
-#if ! MIN_VERSION_base(4,6,0)
-import Prelude hiding (catch)
-#endif
 
 import Network.Transport.Internal
   ( decodeWord32
diff --git a/tests/TestTCP.hs b/tests/TestTCP.hs
--- a/tests/TestTCP.hs
+++ b/tests/TestTCP.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE RebindableSyntax, TemplateHaskell #-}
 {-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE CPP  #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Main where
 
@@ -8,9 +9,6 @@
   , return
   , fail
   , (>>)
-#if ! MIN_VERSION_base(4,6,0)
-  , catch
-#endif
   )
 import Network.Transport
 import Network.Transport.TCP ( createTransport