diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e1fd264e6824..bbd4502f8db5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,5 +6,4 @@ contribute, and we appreciate all contributions.
 To get started with contributing, please take a look at the
 [Contributing to LLVM](https://llvm.org/docs/Contributing.html) guide. It
 describes how to get involved, raise issues and submit patches. Please note
-that at the moment the LLVM project does not use either Github pull requests
-or Github issues.
+that at the moment the LLVM project does not use GitHub pull requests.
diff --git a/llvm/docs/Contributing.rst b/llvm/docs/Contributing.rst
index 90c68afc2874..7b3bcbfe2050 100644
--- a/llvm/docs/Contributing.rst
+++ b/llvm/docs/Contributing.rst
@@ -26,10 +26,9 @@ about it. Please let us know and follow the instructions in
 Bug Fixes
 ---------
 If you are interested in contributing code to LLVM, bugs labeled with the
-`beginner keyword`_ in the `bug tracker`_ are a good way to get familiar with
-the code base. If you are interested in fixing a bug, please create an account
-for the bug tracker and assign it to yourself, to let people know you are working on
-it.
+`beginner`_ keyword in the `bug tracker`_ are a good way to get familiar with
+the code base. If you are interested in fixing a bug please comment on it to
+let people know you are working on it.
 
 Then try to reproduce and fix the bug with upstream LLVM. Start by building
 LLVM from source as described in :doc:`GettingStarted` and
@@ -150,8 +149,8 @@ of LLVM's high-level design, as well as its internals:
 
 .. _Developer's List (llvm-dev): http://lists.llvm.org/mailman/listinfo/llvm-dev
 .. _irc.oftc.net: irc://irc.oftc.net/llvm
-.. _beginner keyword: https://bugs.llvm.org/buglist.cgi?bug_status=NEW&bug_status=REOPENED&keywords=beginner%2C%20&keywords_type=allwords&list_id=130748&query_format=advanced&resolution=---
-.. _bug tracker: https://bugs.llvm.org
+.. _beginner: https://github.com/llvm/llvm-project/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner
+.. _bug tracker: https://github.com/llvm/llvm-project/issues
 .. _clang-format-diff.py: https://reviews.llvm.org/source/llvm-github/browse/main/clang/tools/clang-format/clang-format-diff.py
 .. _git-clang-format: https://reviews.llvm.org/source/llvm-github/browse/main/clang/tools/clang-format/git-clang-format
 .. _LLVM's Phabricator: https://reviews.llvm.org/
diff --git a/llvm/docs/HowToSubmitABug.rst b/llvm/docs/HowToSubmitABug.rst
index 9f0ae7103b88..733dae6c928d 100644
--- a/llvm/docs/HowToSubmitABug.rst
+++ b/llvm/docs/HowToSubmitABug.rst
@@ -20,10 +20,9 @@ linked section to narrow down the bug so that the person who fixes it will be
 able to find the problem more easily.
 
 Once you have a reduced test-case, go to `the LLVM Bug Tracking System
-<https://bugs.llvm.org/enter_bug.cgi>`_ and fill out the form with the
-necessary details (note that you don't need to pick a category, just use
-the "new-bugs" category if you're not sure).  The bug description should
-contain the following information:
+<https://github.com/llvm/llvm-project/issues>`_ and fill out the form with the
+necessary details (note that you don't need to pick a label, just use if you're
+not sure).  The bug description should contain the following information:
 
 * All information necessary to reproduce the problem.
 * The reduced test-case that triggers the bug.