Index: en_US.ISO8859-1/articles/mailing-list-faq/article.xml
===================================================================
--- en_US.ISO8859-1/articles/mailing-list-faq/article.xml
+++ en_US.ISO8859-1/articles/mailing-list-faq/article.xml
@@ -345,8 +345,8 @@
 		<filename>Makefiles</filename>, where <literal>tab</literal>
 		is a significant character.  This is a very common,
 		and very annoying, problem with submissions to the
-		<link xlink:href="&url.base;/support.html#gnats">
-		GNATS Problem Reports database</link>.
+		<link xlink:href="&url.base;/support.html">
+		Problem Reports database</link>.
 		<filename>Makefiles</filename> with tabs changed to either
 		spaces, or the annoying <literal>=3B</literal> escape
 		sequence, create a great deal of aggravation for
Index: en_US.ISO8859-1/htdocs/portmgr/index.xml
===================================================================
--- en_US.ISO8859-1/htdocs/portmgr/index.xml
+++ en_US.ISO8859-1/htdocs/portmgr/index.xml
@@ -113,7 +113,7 @@
   </li>
 
   <!-- arguably the following should be added here:
-    portsmon; fenner's list; PR statistics; GNATS -->
+    portsmon; fenner's list; PR statistics; Problem Report -->
 
   <li>
     <p><a
Index: en_US.ISO8859-1/htdocs/portmgr/policies_contributors.xml
===================================================================
--- en_US.ISO8859-1/htdocs/portmgr/policies_contributors.xml
+++ en_US.ISO8859-1/htdocs/portmgr/policies_contributors.xml
@@ -24,7 +24,7 @@
   commit the change.  If it is a major change (e.g. would require a
   regression run), please contact portmgr first.</p>
 
-<p>We have an add-on to the GNATS database known as the auto-assigner,
+<p>We have an add-on to the Problem Reports database known as the auto-assigner,
   which attempts to automatically notify maintainers of PRs; however,
   it depends on the Synopsis containing category/portname.  In general,
   various people attempt to catch and fix cases where it does not work,