Index: clang-tools-extra/docs/clang-doc.rst
===================================================================
--- clang-tools-extra/docs/clang-doc.rst
+++ clang-tools-extra/docs/clang-doc.rst
@@ -12,7 +12,7 @@
 
 The tool is in a very early development stage, so you might encounter bugs and
 crashes. Submitting reports with information about how to reproduce the issue
-to `the LLVM bugtracker <https://bugs.llvm.org/>`_ will definitely help the
+to `the LLVM Issues <https://github.com/llvm/llvm-project/issues/>`_ will definitely help the
 project. If you have any ideas or suggestions, please to put a feature request
 there.
 
Index: clang/docs/CommandGuide/clang.rst
===================================================================
--- clang/docs/CommandGuide/clang.rst
+++ clang/docs/CommandGuide/clang.rst
@@ -662,7 +662,7 @@
 BUGS
 ----
 
-To report bugs, please visit <https://bugs.llvm.org/>.  Most bug reports should
+To report bugs, please visit <https://github.com/llvm/llvm-project/issues/>.  Most bug reports should
 include preprocessed source files (use the :option:`-E` option) and the full
 output of the compiler, along with information to reproduce.
 
Index: clang/www/c_status.html
===================================================================
--- clang/www/c_status.html
+++ clang/www/c_status.html
@@ -72,8 +72,9 @@
 reports, but we do not currently track our DR status (help with
 tracking DR status is appreciated).</p>
 
-<p>The <a href="https://bugs.llvm.org/">LLVM bug tracker</a> contains a
-Clang C component that tracks known bugs with Clang's language
+<p>The <a href="https://bugs.llvm.org/">LLVM bug tracker</a> and 
+<a href="https://github.com/llvm/llvm-project/issues/">LLVM Issues</a> contain
+a Clang C component that tracks known bugs with Clang's language
 conformance.</p>
 
 <h2 id="c89">C89 implementation status</h2>
Index: clang/www/cxx_status.html
===================================================================
--- clang/www/cxx_status.html
+++ clang/www/cxx_status.html
@@ -76,8 +76,9 @@
 Specifications</a> that will help drive the future of the C++ programming
 language.</p>
 
-<p>The <a href="https://bugs.llvm.org/">LLVM bug tracker</a> contains Clang
-C++ components that track known bugs with Clang's language conformance in
+<p>The <a href="https://bugs.llvm.org/">LLVM bug tracker</a> and 
+<a href="https://github.com/llvm/llvm-project/issues/">LLVM Issues</a> contain
+Clang C++ components that track known bugs with Clang's language conformance in
 each language mode.</p>
 
 <h2 id="cxx98">C++98 implementation status</h2>
Index: clang/www/get_involved.html
===================================================================
--- clang/www/get_involved.html
+++ clang/www/get_involved.html
@@ -65,7 +65,8 @@
 
 <p>If you're looking for something to work on, check out our <a
 href="OpenProjects.html">Open Projects</a> page or look through the <a
-href="https://bugs.llvm.org/">Bugzilla bug database</a>.</p>
+href="https://bugs.llvm.org/">Bugzilla bug database</a> or <a
+href="https://github.com/llvm/llvm-project/issues/">LLVM Issues</a>.</p>
 
 <h2 id="criteria">Contributing Extensions to Clang</h2>
 
Index: clang/www/get_started.html
===================================================================
--- clang/www/get_started.html
+++ clang/www/get_started.html
@@ -19,7 +19,7 @@
 options.  This should get you up and running with the minimum of muss and fuss.
 If you like what you see, please consider <a href="get_involved.html">getting
 involved</a> with the Clang community.  If you run into problems, please file
-bugs in <a href="https://bugs.llvm.org/">LLVM Bugzilla</a>.</p>
+bugs in <a href="https://github.com/llvm/llvm-project/issues">LLVM Issues</a>.</p>
 
 <h2 id="download">Release Clang Versions</h2>
 
Index: clang/www/menu.html.incl
===================================================================
--- clang/www/menu.html.incl
+++ clang/www/menu.html.incl
@@ -36,7 +36,7 @@
     <a href="http://lists.llvm.org/mailman/listinfo/cfe-users">cfe-users List</a>
     <a href="http://lists.llvm.org/mailman/listinfo/cfe-dev">cfe-dev List</a>
     <a href="http://lists.llvm.org/mailman/listinfo/cfe-commits">cfe-commits List</a>
-    <a href="https://bugs.llvm.org/">Bug Reports</a>
+    <a href="https://github.com/llvm/llvm-project/issues">Bug Reports</a>
     <a href="http://planet.clang.org/">Planet Clang</a>
     <a href="irc://irc.oftc.net/llvm">IRC: irc.oftc.net#llvm</a>
   </div>
Index: libcxx/docs/index.rst
===================================================================
--- libcxx/docs/index.rst
+++ libcxx/docs/index.rst
@@ -218,6 +218,7 @@
 * `LLVM Homepage <https://llvm.org/>`_
 * `libc++abi Homepage <http://libcxxabi.llvm.org/>`_
 * `LLVM Bugzilla <https://bugs.llvm.org/>`_
+* `LLVM Issues <https://github.com/llvm/llvm-project/issues/>`_
 * `libcxx-commits Mailing List`_
 * `libcxx-dev Mailing List`_
 * `Browse libc++ Sources <https://github.com/llvm/llvm-project/tree/main/libcxx/>`_
Index: libunwind/docs/index.rst
===================================================================
--- libunwind/docs/index.rst
+++ libunwind/docs/index.rst
@@ -99,6 +99,7 @@
 ===========
 * `LLVM Homepage <https://llvm.org/>`_
 * `LLVM Bugzilla <https://bugs.llvm.org/>`_
+* `LLVM Issues <https://github.com/llvm/llvm-project/issues/>`_
 * `cfe-commits Mailing List`_
 * `cfe-dev Mailing List`_
 * `Browse libunwind Sources <https://github.com/llvm/llvm-project/blob/main/libunwind/>`_
Index: lld/docs/_templates/indexsidebar.html
===================================================================
--- lld/docs/_templates/indexsidebar.html
+++ lld/docs/_templates/indexsidebar.html
@@ -1,4 +1,4 @@
 <h3>Bugs</h3>
 
 <p>lld bugs should be reported at the
-  LLVM <a href="https://bugs.llvm.org/">Bugzilla</a>.</p>
+  LLVM <a href="https://github.com/llvm/llvm-project/issues/">Issues</a>.</p>
Index: lldb/docs/index.rst
===================================================================
--- lldb/docs/index.rst
+++ lldb/docs/index.rst
@@ -178,4 +178,4 @@
 
    Source Code <https://github.com/llvm/llvm-project>
    Code Reviews <https://reviews.llvm.org>
-   Bug Reports <https://bugs.llvm.org/>
+   Bug Reports <https://github.com/llvm/llvm-project/issues/>
Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -234,7 +234,7 @@
 
 set(PACKAGE_NAME LLVM)
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-set(PACKAGE_BUGREPORT "https://bugs.llvm.org/")
+set(PACKAGE_BUGREPORT "https://github.com/llvm/llvm-project/issues/")
 
 set(BUG_REPORT_URL "${PACKAGE_BUGREPORT}" CACHE STRING
   "Default URL where bug reports are to be submitted.")
Index: llvm/docs/CommandGuide/llvm-install-name-tool.rst
===================================================================
--- llvm/docs/CommandGuide/llvm-install-name-tool.rst
+++ llvm/docs/CommandGuide/llvm-install-name-tool.rst
@@ -76,7 +76,7 @@
 BUGS
 ----
 
-To report bugs, please visit <https://bugs.llvm.org/>.
+To report bugs, please visit <https://github.com/llvm/llvm-project/issues/>.
 
 SEE ALSO
 --------
Index: llvm/docs/CommandGuide/llvm-libtool-darwin.rst
===================================================================
--- llvm/docs/CommandGuide/llvm-libtool-darwin.rst
+++ llvm/docs/CommandGuide/llvm-libtool-darwin.rst
@@ -97,7 +97,7 @@
 BUGS
 ----
 
-To report bugs, please visit <https://bugs.llvm.org/>.
+To report bugs, please visit <https://github.com/llvm/llvm-project/issues/>.
 
 SEE ALSO
 --------
Index: llvm/docs/CommandGuide/llvm-lipo.rst
===================================================================
--- llvm/docs/CommandGuide/llvm-lipo.rst
+++ llvm/docs/CommandGuide/llvm-lipo.rst
@@ -70,4 +70,4 @@
 BUGS
 ----
 
-To report bugs, please visit <https://bugs.llvm.org/>.
+To report bugs, please visit <https://github.com/llvm/llvm-project/issues/>.
Index: llvm/docs/CommandGuide/llvm-objcopy.rst
===================================================================
--- llvm/docs/CommandGuide/llvm-objcopy.rst
+++ llvm/docs/CommandGuide/llvm-objcopy.rst
@@ -536,7 +536,7 @@
 BUGS
 ----
 
-To report bugs, please visit <https://bugs.llvm.org/>.
+To report bugs, please visit <https://github.com/llvm/llvm-project/issues/>.
 
 There is a known issue with :option:`--input-target` and :option:`--target`
 causing only ``binary`` and ``ihex`` formats to have any effect. Other values
Index: llvm/docs/CommandGuide/llvm-objdump.rst
===================================================================
--- llvm/docs/CommandGuide/llvm-objdump.rst
+++ llvm/docs/CommandGuide/llvm-objdump.rst
@@ -397,7 +397,7 @@
 BUGS
 ----
 
-To report bugs, please visit <https://bugs.llvm.org/>.
+To report bugs, please visit <https://github.com/llvm/llvm-project/issues/>.
 
 SEE ALSO
 --------
Index: llvm/docs/CommandGuide/llvm-otool.rst
===================================================================
--- llvm/docs/CommandGuide/llvm-otool.rst
+++ llvm/docs/CommandGuide/llvm-otool.rst
@@ -132,7 +132,7 @@
 BUGS
 ----
 
-To report bugs, please visit <https://bugs.llvm.org/>.
+To report bugs, please visit <https://github.com/llvm/llvm-project/issues/>.
 
 SEE ALSO
 --------
Index: llvm/docs/CommandGuide/llvm-size.rst
===================================================================
--- llvm/docs/CommandGuide/llvm-size.rst
+++ llvm/docs/CommandGuide/llvm-size.rst
@@ -191,4 +191,4 @@
 BUGS
 ----
 
-To report bugs, please visit <https://bugs.llvm.org/>.
+To report bugs, please visit <https://github.com/llvm/llvm-project/issues/>.
Index: llvm/docs/CommandGuide/llvm-strings.rst
===================================================================
--- llvm/docs/CommandGuide/llvm-strings.rst
+++ llvm/docs/CommandGuide/llvm-strings.rst
@@ -123,4 +123,4 @@
 BUGS
 ----
 
-To report bugs, please visit <https://bugs.llvm.org/>.
+To report bugs, please visit <https://github.com/llvm/llvm-project/issues/>.
Index: llvm/docs/CommandGuide/llvm-strip.rst
===================================================================
--- llvm/docs/CommandGuide/llvm-strip.rst
+++ llvm/docs/CommandGuide/llvm-strip.rst
@@ -194,7 +194,7 @@
 BUGS
 ----
 
-To report bugs, please visit <https://bugs.llvm.org/>.
+To report bugs, please visit <https://github.com/llvm/llvm-project/issues/>.
 
 SEE ALSO
 --------
Index: llvm/docs/DeveloperPolicy.rst
===================================================================
--- llvm/docs/DeveloperPolicy.rst
+++ llvm/docs/DeveloperPolicy.rst
@@ -61,6 +61,8 @@
 way to see what other people are interested in and watching the flow of the
 project as a whole.
 
+.. FIXME: Edit for LLVM Issues in Github.
+
 We recommend that active developers register an email account with `LLVM
 Bugzilla <https://bugs.llvm.org/>`_ and preferably subscribe to the `llvm-bugs
 <http://lists.llvm.org/mailman/listinfo/llvm-bugs>`_ email list to keep track
Index: llvm/docs/HowToReleaseLLVM.rst
===================================================================
--- llvm/docs/HowToReleaseLLVM.rst
+++ llvm/docs/HowToReleaseLLVM.rst
@@ -277,6 +277,7 @@
 #. Reply to the commit email on llvm-commits for the revision to merge and cc
    the release manager.
 
+.. FIXME: Edit for LLVM Issues in Github.
 .. _bug: https://bugs.llvm.org/
 
 Release Patch Rules
Index: llvm/docs/HowToSubmitABug.rst
===================================================================
--- llvm/docs/HowToSubmitABug.rst
+++ llvm/docs/HowToSubmitABug.rst
@@ -19,6 +19,8 @@
 linked section to narrow down the bug so that the person who fixes it will be
 able to find the problem more easily.
 
+.. FIXME: Edit for LLVM Issues in Github.
+
 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
Index: llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
+++ llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
@@ -8,7 +8,7 @@
   input = "config.h.cmake"
   output = "$target_gen_dir/config.h"
   values = [
-    "BUG_REPORT_URL=https://bugs.llvm.org/",
+    "BUG_REPORT_URL=https://github.com/llvm/llvm-project/issues/",
     "CLANG_DEFAULT_PIE_ON_LINUX=",
     "CLANG_DEFAULT_LINKER=",
     "CLANG_DEFAULT_STD_C=",
Index: llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
@@ -72,7 +72,7 @@
   input = "config.h.cmake"
   output = "$target_gen_dir/config.h"
   values = [
-    "BUG_REPORT_URL=https://bugs.llvm.org/",
+    "BUG_REPORT_URL=https://github.com/llvm/llvm-project/issues/",
     "ENABLE_BACKTRACES=1",
     "ENABLE_CRASH_OVERRIDES=1",
     "BACKTRACE_HEADER=execinfo.h",
@@ -120,7 +120,7 @@
     "LLVM_VERSION_INFO=",
     "LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO=1",
     "LLVM_WINDOWS_PREFER_FORWARD_SLASH=",
-    "PACKAGE_BUGREPORT=https://bugs.llvm.org/",
+    "PACKAGE_BUGREPORT=https://github.com/llvm/llvm-project/issues/",
     "PACKAGE_NAME=LLVM",
     "PACKAGE_STRING=LLVM ${llvm_version}git",
     "PACKAGE_VERSION=${llvm_version}git",
Index: utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h
===================================================================
--- utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h
+++ utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h
@@ -20,7 +20,7 @@
 #define CLANG_CONFIG_H
 
 /* Bug report URL. */
-#define BUG_REPORT_URL "https://bugs.llvm.org/"
+#define BUG_REPORT_URL "https://github.com/llvm/llvm-project/issues/"
 
 /* Default to -fPIE and -pie on Linux. */
 #define CLANG_DEFAULT_PIE_ON_LINUX 0
Index: utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h
===================================================================
--- utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h
+++ utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h
@@ -24,7 +24,7 @@
 #include "llvm/Config/llvm-config.h"
 
 /* Bug report URL. */
-#define BUG_REPORT_URL "https://bugs.llvm.org/"
+#define BUG_REPORT_URL "https://github.com/llvm/llvm-project/issues/"
 
 /* Define to 1 to enable backtraces, and to 0 otherwise. */
 #define ENABLE_BACKTRACES 1
@@ -332,7 +332,7 @@
 /* LTDL_SHLIB_EXT defined in Bazel */
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://bugs.llvm.org/"
+#define PACKAGE_BUGREPORT "https://github.com/llvm/llvm-project/issues/"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "LLVM"