diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-09-03 Laurent P. René de Cotret <laurent.decotret@outlook.com> 0.5.8
+
+* Bumped dependency bounds to support GHC 8.10.7 - GHC 9.10.1
+* Updated links to point to Distributed Haskell monorepo
+
 2024-03-25  David Simmons-Duffin <dsd@caltech.edu> 0.5.7
 
 * Bump bytestring and deepseq versions to build with GHC 9.8.
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.cabal b/network-transport.cabal
--- a/network-transport.cabal
+++ b/network-transport.cabal
@@ -1,15 +1,15 @@
+cabal-version: 3.0
 Name:          network-transport
-Version:       0.5.7
-Cabal-Version: >=1.10
+Version:       0.5.8
 Build-Type:    Simple
-License:       BSD3
+License:       BSD-3-Clause
 License-File:  LICENSE
 Copyright:     Well-Typed LLP
 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/issues
+Homepage:      https://haskell-distributed.github.io
+Bug-Reports:   https://github.com/haskell-distributed/distributed-process/issues
 Synopsis:      Network abstraction layer
 Description:   "Network.Transport" is a Network Abstraction Layer which provides
                the following high-level concepts:
@@ -55,24 +55,34 @@
                This package provides the generic interface only; you will
                probably also want to install at least one transport
                implementation (network-transport-*).
-Tested-With:   GHC==7.6.3 GHC==7.8.4 GHC==7.10.3
+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
+  Location: https://github.com/haskell-distributed/distributed-process
+  SubDir:   packages/network-transport
 
+common warnings
+    ghc-options: -Wall
+                 -Wcompat
+                 -Widentities
+                 -Wincomplete-uni-patterns
+                 -Wincomplete-record-updates
+                 -Wredundant-constraints
+                 -fhide-source-paths
+                 -Wpartial-fields
+
 Library
-  Build-Depends:   base >= 4.6 && < 5,
-                   binary >= 0.5 && < 0.9,
-                   bytestring >= 0.9 && < 0.13,
-                   hashable >= 1.2.0.5 && < 1.5,
+  import:          warnings
+  Build-Depends:   base >= 4.14 && < 5,
+                   binary >= 0.8 && < 0.9,
+                   bytestring >= 0.10 && < 0.13,
+                   hashable >= 1.2.0.5 && < 1.6,
                    transformers >= 0.2 && < 0.7,
                    deepseq >= 1.0 && < 1.6
-  if impl(ghc < 7.6)
-    Build-Depends: ghc-prim >= 0.2 && < 0.4
-  Exposed-Modules: Network.Transport,
+  Exposed-Modules: Network.Transport
                    Network.Transport.Util
                    Network.Transport.Internal
   Other-Extensions: ForeignFunctionInterface
@@ -82,7 +92,7 @@
                    DeriveDataTypeable,
                    GeneralizedNewtypeDeriving,
                    CPP
-  GHC-Options:     -Wall -fno-warn-unused-do-bind
+  GHC-Options:     -fno-warn-unused-do-bind
   HS-Source-Dirs:  src
   Default-Language: Haskell2010
   if os(win32)
diff --git a/src/Network/Transport/Internal.hs b/src/Network/Transport/Internal.hs
--- a/src/Network/Transport/Internal.hs
+++ b/src/Network/Transport/Internal.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP  #-}
 -- | Internal functions
 module Network.Transport.Internal
   ( -- * Encoders/decoders
@@ -22,10 +23,6 @@
     -- * Debugging
   , tlog
   ) where
-
-#if ! MIN_VERSION_base(4,6,0)
-import Prelude hiding (catch)
-#endif
 
 import Foreign.Storable (pokeByteOff, peekByteOff)
 import Foreign.ForeignPtr (withForeignPtr)