diff --git a/configure.ac b/configure.ac
index f5d624db267a3b5eea21292adab485cad331cbd3..0ff4769742cc9695011feff95f82698543260ae5 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], [7.11], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.1], [glasgow-haskell-bugs@haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
diff --git a/iserv/iserv-bin.cabal b/iserv/iserv-bin.cabal
index c7bd8237bad596faab8f70b3efdad1383713918c..a770b4fc99823e11414ddfa05eac5f29a217a361 100644
--- a/iserv/iserv-bin.cabal
+++ b/iserv/iserv-bin.cabal
@@ -23,4 +23,4 @@ Executable iserv
                    bytestring >= 0.10 && < 0.11,
                    containers >= 0.5 && < 0.6,
                    deepseq    >= 1.4 && < 1.5,
-                   ghci       >= 7.11 && < 8.1
+                   ghci       == 8.1
diff --git a/libraries/template-haskell/Language/Haskell/TH/Lib.hs b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
index 3d77a4a77d84009bdf6edb159d07946d120c4620..0dcf81ad228471974d6ae97af9aa3ed63d8c5f1a 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Lib.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
@@ -478,7 +478,7 @@ closedTypeFamilyD tc tvs result injectivity eqns =
 --   3. remove the FamFlavour data type from Syntax module
 --   4. make sure that all references to FamFlavour are gone from DsMeta,
 --      Convert, TcSplice (follows from 3)
-#if __GLASGOW_HASKELL__ > 800
+#if __GLASGOW_HASKELL__ >= 802
 #error Remove deprecated familyNoKindD, familyKindD, closedTypeFamilyNoKindD and closedTypeFamilyKindD
 #endif
 
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index ff9fe05367777256455cca30ea5e1fdbab9db884..aae8afee59d2452b5ba3ab37f8675acdc2836c35 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -48,7 +48,7 @@ Library
 
     build-depends:
         base       >= 4.6 && < 4.10,
-        ghc-boot   >= 7.11 && < 8.1,
+        ghc-boot   == 8.1,
         pretty     == 1.1.*
 
     -- We need to set the unit ID to template-haskell (without a
diff --git a/utils/haddock b/utils/haddock
index 80f2f9805b61e8cea291bae8ce22db626dc11f21..6ddd758be0e7b50bd19d33400b3c3013d60786cb 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 80f2f9805b61e8cea291bae8ce22db626dc11f21
+Subproject commit 6ddd758be0e7b50bd19d33400b3c3013d60786cb