diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 99a6527878..9914a4d2c9 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -41,6 +41,7 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
+      &tm-attrib.cvsup;
       &tm-attrib.ibm;
       &tm-attrib.intel;
       &tm-attrib.sparc;
@@ -676,11 +677,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.o
 	</itemizedlist>
 
 	<para>You will almost certainly get a conflict because
-	  of the <literal>$Id: article.sgml,v 1.175 2003-11-22 01:34:19 peter Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.176 2003-12-24 00:26:39 simon Exp $</literal> (or in FreeBSD's case,
 	  <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
 	  lines, so you will have to edit the file to resolve the conflict
-	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.175 2003-11-22 01:34:19 peter Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.175 2003-11-22 01:34:19 peter Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.176 2003-12-24 00:26:39 simon Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.176 2003-12-24 00:26:39 simon Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
diff --git a/en_US.ISO8859-1/articles/contributors/article.sgml b/en_US.ISO8859-1/articles/contributors/article.sgml
index e5207706dd..47bb01606b 100644
--- a/en_US.ISO8859-1/articles/contributors/article.sgml
+++ b/en_US.ISO8859-1/articles/contributors/article.sgml
@@ -26,6 +26,7 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
+      &tm-attrib.cvsup;
       &tm-attrib.sun;
       &tm-attrib.general;
     </legalnotice>
diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml b/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
index 9575640d77..78f9f8a34d 100644
--- a/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
+++ b/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
@@ -29,6 +29,7 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
+      &tm-attrib.cvsup;
       &tm-attrib.general;
     </legalnotice>
 
diff --git a/en_US.ISO8859-1/articles/hubs/article.sgml b/en_US.ISO8859-1/articles/hubs/article.sgml
index 1741b9523f..218d343cdf 100644
--- a/en_US.ISO8859-1/articles/hubs/article.sgml
+++ b/en_US.ISO8859-1/articles/hubs/article.sgml
@@ -49,6 +49,7 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
+      &tm-attrib.cvsup;
       &tm-attrib.general;
     </legalnotice>
 
diff --git a/en_US.ISO8859-1/articles/java-tomcat/article.sgml b/en_US.ISO8859-1/articles/java-tomcat/article.sgml
index fcb4ba2488..cccc531ffa 100644
--- a/en_US.ISO8859-1/articles/java-tomcat/article.sgml
+++ b/en_US.ISO8859-1/articles/java-tomcat/article.sgml
@@ -87,6 +87,7 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
+      &tm-attrib.cvsup;
       &tm-attrib.linux;
       &tm-attrib.microsoft;
       &tm-attrib.sun;
diff --git a/en_US.ISO8859-1/articles/problem-reports/article.sgml b/en_US.ISO8859-1/articles/problem-reports/article.sgml
index 4b89a435d6..a59c26c8ac 100644
--- a/en_US.ISO8859-1/articles/problem-reports/article.sgml
+++ b/en_US.ISO8859-1/articles/problem-reports/article.sgml
@@ -15,6 +15,7 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
+      &tm-attrib.cvsup;
       &tm-attrib.ibm;
       &tm-attrib.intel;
       &tm-attrib.sparc;
diff --git a/en_US.ISO8859-1/articles/releng/article.sgml b/en_US.ISO8859-1/articles/releng/article.sgml
index 26bcc95e5d..a57afe9b29 100644
--- a/en_US.ISO8859-1/articles/releng/article.sgml
+++ b/en_US.ISO8859-1/articles/releng/article.sgml
@@ -52,6 +52,7 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
+      &tm-attrib.cvsup;
       &tm-attrib.intel;
       &tm-attrib.xfree86;
       &tm-attrib.general;
diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index 0e0eba9ecb..8c00dcc757 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -92,6 +92,7 @@
       &tm-attrib.apple;
       &tm-attrib.corel;
       &tm-attrib.creative;
+      &tm-attrib.cvsup;
       &tm-attrib.heidelberger;
       &tm-attrib.ibm;
       &tm-attrib.ieee;
diff --git a/share/sgml/trademarks.ent b/share/sgml/trademarks.ent
index 73fc18abed..79fe3dd2d4 100644
--- a/share/sgml/trademarks.ent
+++ b/share/sgml/trademarks.ent
@@ -92,6 +92,10 @@
   countries.</para>">
 <!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
 
+<!-- http://www.cvsup.org/ -->
+<!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of
+  John D. Polstra.</para>">
+
 <!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
 <!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
   Optiplex, PowerEdge are trademarks or registered trademarks of Dell