diff --git a/clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-goto.rst b/clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-goto.rst
index ab36dc37a2be0..f543f616feba0 100644
--- a/clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-goto.rst
+++ b/clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-goto.rst
@@ -1,4 +1,6 @@
 .. title:: clang-tidy - hicpp-avoid-goto
+.. meta::
+   :http-equiv=refresh: 5;URL=../cppcoreguidelines/avoid-goto.html
 
 hicpp-avoid-goto
 ================
diff --git a/clang-tools-extra/docs/clang-tidy/checks/list.rst b/clang-tools-extra/docs/clang-tidy/checks/list.rst
index 48147eadd8df6..51736febb8792 100644
--- a/clang-tools-extra/docs/clang-tidy/checks/list.rst
+++ b/clang-tools-extra/docs/clang-tidy/checks/list.rst
@@ -241,7 +241,6 @@ Clang-Tidy Checks
    `google-runtime-int <google/runtime-int.html>`_,
    `google-runtime-operator <google/runtime-operator.html>`_,
    `google-upgrade-googletest-case <google/upgrade-googletest-case.html>`_, "Yes"
-   `hicpp-avoid-goto <hicpp/avoid-goto.html>`_,
    `hicpp-exception-baseclass <hicpp/exception-baseclass.html>`_,
    `hicpp-multiway-paths-covered <hicpp/multiway-paths-covered.html>`_,
    `hicpp-no-assembler <hicpp/no-assembler.html>`_,
@@ -503,6 +502,7 @@ Clang-Tidy Checks
    `google-readability-function-size <google/readability-function-size.html>`_, `readability-function-size <readability/function-size.html>`_,
    `google-readability-namespace-comments <google/readability-namespace-comments.html>`_, `llvm-namespace-comment <llvm/namespace-comment.html>`_,
    `hicpp-avoid-c-arrays <hicpp/avoid-c-arrays.html>`_, `modernize-avoid-c-arrays <modernize/avoid-c-arrays.html>`_,
+   `hicpp-avoid-goto <hicpp/avoid-goto.html>`_, cppcoreguidelines-avoid-goto <cppcoreguidelines/avoid-goto>`_,
    `hicpp-braces-around-statements <hicpp/braces-around-statements.html>`_, `readability-braces-around-statements <readability/braces-around-statements.html>`_, "Yes"
    `hicpp-deprecated-headers <hicpp/deprecated-headers.html>`_, `modernize-deprecated-headers <modernize/deprecated-headers.html>`_, "Yes"
    `hicpp-explicit-conversions <hicpp/explicit-conversions.html>`_, `google-explicit-constructor <google/explicit-constructor.html>`_, "Yes"