diff --git a/share/xml/header.ent b/share/xml/header.ent
index 14639e7e42..ddfb613f00 100644
--- a/share/xml/header.ent
+++ b/share/xml/header.ent
@@ -125,8 +125,8 @@
 	<ul>
 	  <li><a href="&base;/commercial/commercial.html">Vendors</a></li>
 	  <li><a href="http://security.FreeBSD.org/">Security Information</a></li>
-	  <li><a href="https://bugs.freebsd.org/bugzilla/query.cgi">Bug Reports</a></li>
-	  <li><a href="https://bugs.freebsd.org/bugzilla/enter_bug.cgi">Submit Bug-report</a></li>
+	  <li><a href="https://bugs.FreeBSD.org/search/">Bug Reports</a></li>
+	  <li><a href="https://www.FreeBSD.org/support.html">Submit Bug-report</a></li>
 	</ul>
       </li>
     </ul>
diff --git a/share/xml/libcommon.xsl b/share/xml/libcommon.xsl
index 52156c53c9..cc052ea5e8 100644
--- a/share/xml/libcommon.xsl
+++ b/share/xml/libcommon.xsl
@@ -243,7 +243,7 @@
     <p>FreeBSD's widespread popularity has spawned a number of user groups
       around the world.</p>
     <p>If you know of a FreeBSD user group not listed here,
-      please fill out a <a href="https://bugs.freebsd.org/bugzilla/enter_bug.cgi">
+      please fill out a <a href="https://www.FreeBSD.org/support.html">
 	problem report</a> for category www with the following information:</p>
     <ol>
       <li>A URL for the user group's website.</li>
diff --git a/share/xml/navibar.ent b/share/xml/navibar.ent
index 716db442ae..503783d2d6 100644
--- a/share/xml/navibar.ent
+++ b/share/xml/navibar.ent
@@ -181,7 +181,7 @@
     </ul></li>
     <li><a href="&base;/support/bugreports.html">Bug Reports</a>
       <ul>
-	<li><a href="https://bugs.freebsd.org/bugzilla/enter_bug.cgi">Submit a Problem Report</a></li>
+	<li><a href="https://www.FreeBSD.org/support.html">Submit a Problem Report</a></li>
       </ul></li>
     <li><a href="&base;/support/webresources.html">Web Resources</a></li>
   </ul>
diff --git a/share/xml/templates.entries.xsl b/share/xml/templates.entries.xsl
index 2caa0ab4ef..c6d164aec4 100644
--- a/share/xml/templates.entries.xsl
+++ b/share/xml/templates.entries.xsl
@@ -40,7 +40,7 @@
       commercial listing into several sections. If your company
       supports a FreeBSD-compatible product or service that should
       be added to this page, please fill out a
-      <a href="https://bugs.freebsd.org/bugzilla/enter_bug.cgi">problem report</a> for
+      <a href="https://www.FreeBSD.org/support.html">problem report</a> for
       category www.  Submissions should be in HTML and a medium-sized
       paragraph in length.</p>