diff --git a/configure.ac b/configure.ac
index bffd3dbc9d99624383b841cca99867a3611aed31..da9e0e0d66d8358d68ff26bb0d1fbf8fdb7f31e4 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], [9.4.6], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.4.7], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION])
# Version on master must be X.Y (not X.Y.Z) for ProjectVersionMunged variable
# to be useful (cf #19058). However, the version must have three components
# (X.Y.Z) on stable branches (e.g. ghc-9.2) to ensure that pre-releases are
diff --git a/docs/users_guide/9.4.7-notes.rst b/docs/users_guide/9.4.7-notes.rst
new file mode 100644
index 0000000000000000000000000000000000000000..5fb35b9d8b1bc884521fdf643dedf76fca37d2ca
--- /dev/null
+++ b/docs/users_guide/9.4.7-notes.rst
@@ -0,0 +1,84 @@
+.. _release-9-4-6:
+
+Version 9.4.7
+==============
+
+The significant changes to the various parts of the compiler are listed in the
+following sections.
+
+The :ghc-flag:`LLVM backend <-fllvm>` of this release is to be used with LLVM
+10, 11, 12, 13, or 14.
+
+Significant Changes
+~~~~~~~~~~~~~~~~~~~~
+
+Issues fixed in this release include:
+
+Compiler
+--------
+
+- Fix a number of scoping bugs in the specialiser, prevent simplifier
+ panics (:ghc-ticket:`21391`, :ghc-ticket:`21689`, :ghc-ticket:`21828`,
+ :ghc-ticket:`23762`).
+
+Build system and packaging
+--------------------------
+
+- Allow building documentation with sphinx versions older than ``4.0`` along
+ with older versions of ``python`` (:ghc-ticket:`23807`, :ghc-ticket:`23818`).
+
+- Also build vanilla (non-static) alpine bindists (:ghc-ticket:`23349`, :ghc-ticket:`23828`).
+
+- Make hadrian buildable with Cabal-3.8.
+
+Core libraries
+--------------
+
+- Bump ``bytestring`` to 0.11.5.2 (:ghc-ticket:`23789`), allowing GHC to be
+ bootstrapped on systems having ``HAVE_PTHREAD_CONDATTR_SETCLOCK``
+
+Included libraries
+------------------
+
+The package database provided with this distribution also contains a number of
+packages other than GHC itself. See the changelogs provided with these packages
+for further change information.
+
+.. ghc-package-list::
+
+ libraries/array/array.cabal: Dependency of ``ghc`` library
+ libraries/base/base.cabal: Core library
+ libraries/binary/binary.cabal: Dependency of ``ghc`` library
+ libraries/bytestring/bytestring.cabal: Dependency of ``ghc`` library
+ libraries/Cabal/Cabal/Cabal.cabal: Dependency of ``ghc-pkg`` utility
+ libraries/Cabal/Cabal-syntax/Cabal-syntax.cabal: Dependency of ``ghc-pkg`` utility
+ libraries/containers/containers/containers.cabal: Dependency of ``ghc`` library
+ libraries/deepseq/deepseq.cabal: Dependency of ``ghc`` library
+ libraries/directory/directory.cabal: Dependency of ``ghc`` library
+ libraries/exceptions/exceptions.cabal: Dependency of ``ghc`` and ``haskeline`` library
+ libraries/filepath/filepath.cabal: Dependency of ``ghc`` library
+ compiler/ghc.cabal: The compiler itself
+ libraries/ghci/ghci.cabal: The REPL interface
+ libraries/ghc-boot/ghc-boot.cabal: Internal compiler library
+ libraries/ghc-boot-th/ghc-boot-th.cabal: Internal compiler library
+ libraries/ghc-compact/ghc-compact.cabal: Core library
+ libraries/ghc-heap/ghc-heap.cabal: GHC heap-walking library
+ libraries/ghc-prim/ghc-prim.cabal: Core library
+ libraries/haskeline/haskeline.cabal: Dependency of ``ghci`` executable
+ libraries/hpc/hpc.cabal: Dependency of ``hpc`` executable
+ libraries/integer-gmp/integer-gmp.cabal: Core library
+ libraries/libiserv/libiserv.cabal: Internal compiler library
+ libraries/mtl/mtl.cabal: Dependency of ``Cabal`` library
+ libraries/parsec/parsec.cabal: Dependency of ``Cabal`` library
+ libraries/pretty/pretty.cabal: Dependency of ``ghc`` library
+ libraries/process/process.cabal: Dependency of ``ghc`` library
+ libraries/stm/stm.cabal: Dependency of ``haskeline`` library
+ libraries/template-haskell/template-haskell.cabal: Core library
+ libraries/terminfo/terminfo.cabal: Dependency of ``haskeline`` library
+ libraries/text/text.cabal: Dependency of ``Cabal`` library
+ libraries/time/time.cabal: Dependency of ``ghc`` library
+ libraries/transformers/transformers.cabal: Dependency of ``ghc`` library
+ libraries/unix/unix.cabal: Dependency of ``ghc`` library
+ libraries/Win32/Win32.cabal: Dependency of ``ghc`` library
+ libraries/xhtml/xhtml.cabal: Dependency of ``haddock`` executable
+
diff --git a/docs/users_guide/release-notes.rst b/docs/users_guide/release-notes.rst
index c37ff458f6db9c63499e3efd14f975b70fe55579..0af56058d00b5fc0016219608587d1bc4c3cf235 100644
--- a/docs/users_guide/release-notes.rst
+++ b/docs/users_guide/release-notes.rst
@@ -4,6 +4,7 @@ Release notes
.. toctree::
:maxdepth: 1
+ 9.4.7-notes
9.4.6-notes
9.4.5-notes
9.4.4-notes
diff --git a/testsuite/tests/linters/notes.stdout b/testsuite/tests/linters/notes.stdout
index ac4d7b326d008572bee30238bc2fec71779fa5b8..1af8fc064a91a1acfda8fa6595ec267fc060a77a 100644
--- a/testsuite/tests/linters/notes.stdout
+++ b/testsuite/tests/linters/notes.stdout
@@ -17,13 +17,14 @@ ref compiler/GHC/Core/Opt/OccurAnal.hs:851:15: Note [Loop breaking]
ref compiler/GHC/Core/Opt/SetLevels.hs:1598:30: Note [Top level scope]
ref compiler/GHC/Core/Opt/Simplify.hs:1708:17: Note [Core let/app invariant]
ref compiler/GHC/Core/Opt/Simplify.hs:2672:13: Note [Case binder next]
-ref compiler/GHC/Core/Opt/Simplify.hs:3294:0: Note [Suppressing binder-swaps on linear case]
-ref compiler/GHC/Core/Opt/Simplify.hs:3844:8: Note [Lambda-bound unfoldings]
-ref compiler/GHC/Core/Opt/Simplify.hs:4200:33: Note [Do not eta-expand trivial expressions]
+ref compiler/GHC/Core/Opt/Simplify.hs:3296:0: Note [Suppressing binder-swaps on linear case]
+ref compiler/GHC/Core/Opt/Simplify.hs:3846:8: Note [Lambda-bound unfoldings]
+ref compiler/GHC/Core/Opt/Simplify.hs:4202:33: Note [Do not eta-expand trivial expressions]
ref compiler/GHC/Core/Opt/Simplify/Utils.hs:1240:37: Note [Gentle mode]
ref compiler/GHC/Core/Opt/Simplify/Utils.hs:1294:7: Note [Core let/app invariant]
ref compiler/GHC/Core/Opt/Simplify/Utils.hs:1420:7: Note [Core let/app invariant]
-ref compiler/GHC/Core/Opt/Specialise.hs:1548:29: Note [Arity decrease]
+ref compiler/GHC/Core/Opt/Specialise.hs:1566:29: Note [Arity decrease]
+ref compiler/GHC/Core/Opt/Specialise.hs:2964:27: Note [Specialising polymorphic dictionaries]
ref compiler/GHC/Core/RoughMap.hs:183:35: Note [RoughMatch and beta reduction]
ref compiler/GHC/Core/Subst.hs:100:60: Note [Apply once]
ref compiler/GHC/Core/Subst.hs:111:16: Note [Extending the TCvSubst]
@@ -78,7 +79,7 @@ ref compiler/GHC/Tc/Errors.hs:178:13: Note [Fail fast on kind errors]
ref compiler/GHC/Tc/Errors.hs:2239:0: Note [Highlighting ambiguous type variables]
ref compiler/GHC/Tc/Errors/Ppr.hs:2084:11: Note [Highlighting ambiguous type variables]
ref compiler/GHC/Tc/Gen/Arrow.hs:438:29: Note [RecStmt]
-ref compiler/GHC/Tc/Gen/Bind.hs:1368:19: Note [Existentials in pattern bindings]
+ref compiler/GHC/Tc/Gen/Bind.hs:1388:19: Note [Existentials in pattern bindings]
ref compiler/GHC/Tc/Gen/Export.hs:188:15: Note [Modules without a module header]
ref compiler/GHC/Tc/Gen/Export.hs:423:0: Note [Modules without a module header]
ref compiler/GHC/Tc/Gen/Export.hs:581:7: Note [Typing Pattern Synonym Exports]
@@ -122,7 +123,7 @@ ref compiler/GHC/Tc/Utils/Env.hs:556:7: Note [Bindings with closed types]
ref compiler/GHC/Tc/Utils/Env.hs:1128:7: Note [Generating fresh names for ccall wrapper]
ref compiler/GHC/Tc/Utils/Env.hs:1141:0: Note [Generating fresh names for FFI wrappers]
ref compiler/GHC/Tc/Utils/Env.hs:1192:7: Note [Placeholder PatSyn kinds]
-ref compiler/GHC/Tc/Utils/TcMType.hs:750:7: Note [Kind checking for GADTs]
+ref compiler/GHC/Tc/Utils/TcMType.hs:768:7: Note [Kind checking for GADTs]
ref compiler/GHC/Tc/Utils/TcType.hs:591:7: Note [TyVars and TcTyVars]
ref compiler/GHC/ThToHs.hs:1788:11: Note [Adding parens for splices]
ref compiler/GHC/ThToHs.hs:1799:3: Note [Adding parens for splices]