diff --git a/configure.ac b/configure.ac
index 1f9840743562a76714ee385a748c15ba93948152..5301a6e435c45b18fd5d2d41469bb92fb7b5d010 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.6.0], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.7.0], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
diff --git a/libraries/libiserv/libiserv.cabal b/libraries/libiserv/libiserv.cabal
index 183e7774d2bd70b77f7de708621986bed127ce47..f29875cd7d673d21a5462c6f41e98f5630b58203 100644
--- a/libraries/libiserv/libiserv.cabal
+++ b/libraries/libiserv/libiserv.cabal
@@ -1,5 +1,5 @@
 Name: libiserv
-Version: 8.6.1
+Version: 8.7.1
 Copyright: XXX
 License: BSD3
 License-File: LICENSE
@@ -25,7 +25,7 @@ Library
                    bytestring >= 0.10 && < 0.11,
                    containers >= 0.5 && < 0.7,
                    deepseq    >= 1.4 && < 1.5,
-                   ghci       == 8.6.*
+                   ghci       == 8.7.*
     if flag(network)
        Exposed-Modules: Remote.Message
                       , Remote.Slave
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index 590babd2f4f42cc00a6f38623d5a4d998f911736..6cd156ccb675c70f2ed4990fb35fbe209609e8e3 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -52,7 +52,7 @@ Library
 
     build-depends:
         base        >= 4.9 && < 4.13,
-        ghc-boot-th == 8.6.*,
+        ghc-boot-th == 8.7.*,
         pretty      == 1.1.*
 
     ghc-options: -Wall
diff --git a/utils/haddock b/utils/haddock
index 679f61210b18acd6299687fca66c81196ca358a5..3266a962f7b6083b4b48cb66e70c62e3157df930 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 679f61210b18acd6299687fca66c81196ca358a5
+Subproject commit 3266a962f7b6083b4b48cb66e70c62e3157df930
diff --git a/utils/iserv/iserv.cabal b/utils/iserv/iserv.cabal
index 684da9410b66deca87540e12bcca18232ca06838..af0e385abea2412f95c520abb58ef6c99cec5459 100644
--- a/utils/iserv/iserv.cabal
+++ b/utils/iserv/iserv.cabal
@@ -1,5 +1,5 @@
 Name: iserv
-Version: 8.6.1
+Version: 8.7.1
 Copyright: XXX
 License: BSD3
 -- XXX License-File: LICENSE
@@ -35,8 +35,8 @@ Executable iserv
                    bytestring >= 0.10 && < 0.11,
                    containers >= 0.5 && < 0.7,
                    deepseq    >= 1.4 && < 1.5,
-                   ghci       == 8.6.*,
-                   libiserv   == 8.6.*
+                   ghci       == 8.7.*,
+                   libiserv   == 8.7.*
 
     if os(windows)
         Cpp-Options: -DWINDOWS