diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc
index 6ff6c15314..c88035597e 100644
--- a/docs/manual/contribute.adoc
+++ b/docs/manual/contribute.adoc
@@ -25,7 +25,7 @@ for more information on obtaining a Buildroot git tree.
 === Reproducing, analyzing and fixing bugs
 
 A first way of contributing is to have a look at the open bug reports in
-the https://bugs.buildroot.org/buglist.cgi?product=buildroot[Buildroot bug
+the https://gitlab.com/buildroot.org/buildroot/-/issues[Buildroot bug
 tracker]. As we strive to keep the bug count as small as possible, all
 help in reproducing, analyzing and fixing reported bugs is more than
 welcome. Don't hesitate to add a comment to bug reports reporting your
diff --git a/docs/manual/resources.adoc b/docs/manual/resources.adoc
index 68b7eb9062..4ef709c317 100644
--- a/docs/manual/resources.adoc
+++ b/docs/manual/resources.adoc
@@ -40,7 +40,7 @@ better as it will reach more people, both developers and users.
 Bug tracker::
 +
 Bugs in Buildroot can be reported via the mailing list or alternatively
-via the https://bugs.buildroot.org/buglist.cgi?product=buildroot[Buildroot
+via the https://gitlab.com/buildroot.org/buildroot/-/issues[Buildroot
 bugtracker]. Please refer to xref:reporting-bugs[] before creating a bug
 report.
 
diff --git a/docs/website/contribute.html b/docs/website/contribute.html
index aa1cf93f1b..95028ee788 100644
--- a/docs/website/contribute.html
+++ b/docs/website/contribute.html
@@ -13,7 +13,7 @@
 
       <ul>
 	<li>Reproducing, analyzing and fixing bugs from our
-	  <a href="https://bugs.buildroot.org/">bug tracker</a></li>
+	  <a href="https://gitlab.com/buildroot.org/buildroot/-/issues">bug tracker</a></li>
 	<li>Analyzing and fixing <a href="http://autobuild.buildroot.org/">
 	    autobuild failures</a></li>
 	<li>Reviewing and testing patches sent by other developers. See the
diff --git a/docs/website/support.html b/docs/website/support.html
index 28873c6d76..0bcf365332 100644
--- a/docs/website/support.html
+++ b/docs/website/support.html
@@ -81,7 +81,7 @@
 		</div>
 		<div class="col-sm-11">
 		  <p>If you think you found a bug in Buildroot, you can use the
-		    <a href="https://bugs.buildroot.org/">Bug Tracker</a> to post your bugs and/or
+		    <a href="https://gitlab.com/buildroot.org/buildroot/-/issues">Bug Tracker</a> to post your bugs and/or
 		    participate to find solutions to existing problems.</p>
 
 		  <p>Note: patches are only accepted through the mailing list.</p>
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 672f9472a9..e4780353cb 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -83,7 +83,7 @@ HOST_GCC_COMMON_CONF_OPTS = \
 	--with-mpc=$(HOST_DIR) \
 	--with-mpfr=$(HOST_DIR) \
 	--with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \
-	--with-bugurl="http://bugs.buildroot.net/" \
+	--with-bugurl="https://gitlab.com/buildroot.org/buildroot/-/issues" \
 	--without-zstd
 
 ifeq ($(BR2_REPRODUCIBLE),y)