diff --git a/compiler/ghci/ByteCodeLink.hs b/compiler/ghci/ByteCodeLink.hs
index f2a368ba5c2691c3dce286ff62eefe71586bbd67..9138d1c125b0d308da5a71c47423dd32bbbea937 100644
--- a/compiler/ghci/ByteCodeLink.hs
+++ b/compiler/ghci/ByteCodeLink.hs
@@ -154,8 +154,8 @@ linkFail who what
                 , "the missing library using the -L/path/to/object/dir and -lmissinglibname"
                 , "flags, or simply by naming the relevant files on the GHCi command line."
                 , "Alternatively, this link failure might indicate a bug in GHCi."
-                , "If you suspect the latter, please send a bug report to:"
-                , "  glasgow-haskell-bugs@haskell.org"
+                , "If you suspect the latter, please report this as a GHC bug:"
+                , "  https://www.haskell.org/ghc/reportabug"
                 ])
 
 
diff --git a/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr b/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr
index fdb91d14c3d7a209a9827221dd17b077b18f25f5..30d756f05857cf4b412ca49f8467e1abae9715b4 100644
--- a/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr
+++ b/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr
@@ -20,6 +20,6 @@ archives or DLLs needed by your current session.  Restart GHCi, specifying
 the missing library using the -L/path/to/object/dir and -lmissinglibname
 flags, or simply by naming the relevant files on the GHCi command line.
 Alternatively, this link failure might indicate a bug in GHCi.
-If you suspect the latter, please send a bug report to:
-  glasgow-haskell-bugs@haskell.org
+If you suspect the latter, please report this as a GHC bug:
+  https://www.haskell.org/ghc/reportabug
 
diff --git a/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-32-mingw32 b/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-32-mingw32
index 73d736c85fe9f9285a2592011eec52f21adc5bf1..1b32baf67e4f6ea9ef9180c9d4a21c3359834ee5 100644
--- a/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-32-mingw32
+++ b/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-32-mingw32
@@ -20,6 +20,6 @@ archives or DLLs needed by your current session.  Restart GHCi, specifying
 the missing library using the -L/path/to/object/dir and -lmissinglibname
 flags, or simply by naming the relevant files on the GHCi command line.
 Alternatively, this link failure might indicate a bug in GHCi.
-If you suspect the latter, please send a bug report to:
-  glasgow-haskell-bugs@haskell.org
+If you suspect the latter, please report this as a GHC bug:
+  https://www.haskell.org/ghc/reportabug
 
diff --git a/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-64-mingw32 b/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-64-mingw32
index 1fea3e20793503007505ee579fb9af3b063f615e..d38e1c00ec8708e75ebe98c67ce80581c62a5d0e 100644
--- a/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-64-mingw32
+++ b/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-64-mingw32
@@ -20,6 +20,6 @@ archives or DLLs needed by your current session.  Restart GHCi, specifying
 the missing library using the -L/path/to/object/dir and -lmissinglibname
 flags, or simply by naming the relevant files on the GHCi command line.
 Alternatively, this link failure might indicate a bug in GHCi.
-If you suspect the latter, please send a bug report to:
-  glasgow-haskell-bugs@haskell.org
+If you suspect the latter, please report this as a GHC bug:
+  https://www.haskell.org/ghc/reportabug
 
diff --git a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr
index b5e9213149141ce8f68a517b9b3b7173d6a8f95e..0f54eab090d87cad0620dcf7781d99217e5e037b 100644
--- a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr
+++ b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr
@@ -20,6 +20,6 @@ archives or DLLs needed by your current session.  Restart GHCi, specifying
 the missing library using the -L/path/to/object/dir and -lmissinglibname
 flags, or simply by naming the relevant files on the GHCi command line.
 Alternatively, this link failure might indicate a bug in GHCi.
-If you suspect the latter, please send a bug report to:
-  glasgow-haskell-bugs@haskell.org
+If you suspect the latter, please report this as a GHC bug:
+  https://www.haskell.org/ghc/reportabug
 
diff --git a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-32-mingw32 b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-32-mingw32
index 48245cc4c1bc3920100c1cba616e2cd6a5b02714..6226dda848d84d55a9e1006badab5850b32c0925 100644
--- a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-32-mingw32
+++ b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-32-mingw32
@@ -20,6 +20,6 @@ archives or DLLs needed by your current session.  Restart GHCi, specifying
 the missing library using the -L/path/to/object/dir and -lmissinglibname
 flags, or simply by naming the relevant files on the GHCi command line.
 Alternatively, this link failure might indicate a bug in GHCi.
-If you suspect the latter, please send a bug report to:
-  glasgow-haskell-bugs@haskell.org
+If you suspect the latter, please report this as a GHC bug:
+  https://www.haskell.org/ghc/reportabug
 
diff --git a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-64-mingw32 b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-64-mingw32
index 4d4656f69081a74afb56c2041ccf8ccefed68159..5b9103e60661286a50b465bfcef386a5be680a99 100644
--- a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-64-mingw32
+++ b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-64-mingw32
@@ -20,6 +20,6 @@ archives or DLLs needed by your current session.  Restart GHCi, specifying
 the missing library using the -L/path/to/object/dir and -lmissinglibname
 flags, or simply by naming the relevant files on the GHCi command line.
 Alternatively, this link failure might indicate a bug in GHCi.
-If you suspect the latter, please send a bug report to:
-  glasgow-haskell-bugs@haskell.org
+If you suspect the latter, please report this as a GHC bug:
+  https://www.haskell.org/ghc/reportabug