Index: ghc-8.10.7/docs/users_guide/ghc_config.py.in
===================================================================
--- ghc-8.10.7.orig/docs/users_guide/ghc_config.py.in
+++ ghc-8.10.7/docs/users_guide/ghc_config.py.in
@@ -1,6 +1,6 @@
 extlinks = {
-    'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#'),
-    'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#'),
+    'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#%s'),
+    'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#%s'),
 }
 
 libs_base_uri = '../libraries'
Index: ghc-8.10.7/libraries/Cabal/Cabal/doc/conf.py
===================================================================
--- ghc-8.10.7.orig/libraries/Cabal/Cabal/doc/conf.py
+++ ghc-8.10.7/libraries/Cabal/Cabal/doc/conf.py
@@ -24,12 +24,12 @@ master_doc = 'index'
 
 # extlinks -- see http://www.sphinx-doc.org/en/stable/ext/extlinks.html
 extlinks = {
-    'issue': ('https://github.com/haskell/cabal/issues/%s', '#'),
+    'issue': ('https://github.com/haskell/cabal/issues/%s', '#%s'),
 
-    'ghc-wiki': ('http://ghc.haskell.org/trac/ghc/wiki/%s', ''),
-    'ghc-ticket': ('http://ghc.haskell.org/trac/ghc/ticket/%s', 'GHC #'),
+    'ghc-wiki': ('http://ghc.haskell.org/trac/ghc/wiki/%s', None),
+    'ghc-ticket': ('http://ghc.haskell.org/trac/ghc/ticket/%s', 'GHC #%s'),
 
-    'hackage-pkg': ('http://hackage.haskell.org/package/%s', ''),
+    'hackage-pkg': ('http://hackage.haskell.org/package/%s', None),
 }
 
 # General information about the project.