diff --git a/de_DE.ISO8859-1/htdocs/news/2002/news.xml b/de_DE.ISO8859-1/htdocs/news/2002/news.xml
index a92e94949d..e491f2b884 100644
--- a/de_DE.ISO8859-1/htdocs/news/2002/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2002/news.xml
@@ -25,11 +25,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2002</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2003/news.xml b/de_DE.ISO8859-1/htdocs/news/2003/news.xml
index 10afae6bce..1d44836c7c 100644
--- a/de_DE.ISO8859-1/htdocs/news/2003/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2003/news.xml
@@ -26,11 +26,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2003</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2004/news.xml b/de_DE.ISO8859-1/htdocs/news/2004/news.xml
index 9c4ab213f6..1f9a765db0 100644
--- a/de_DE.ISO8859-1/htdocs/news/2004/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2004/news.xml
@@ -26,11 +26,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2004</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2004/press.xml b/de_DE.ISO8859-1/htdocs/news/2004/press.xml
index 8a2be213b5..0c7c2d3477 100644
--- a/de_DE.ISO8859-1/htdocs/news/2004/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2004/press.xml
@@ -10,11 +10,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2004</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2005/news.xml b/de_DE.ISO8859-1/htdocs/news/2005/news.xml
index e1a66b0076..0eac1d744a 100644
--- a/de_DE.ISO8859-1/htdocs/news/2005/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2005/news.xml
@@ -25,11 +25,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2005</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2005/press.xml b/de_DE.ISO8859-1/htdocs/news/2005/press.xml
index d196048e3a..752e7e1875 100644
--- a/de_DE.ISO8859-1/htdocs/news/2005/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2005/press.xml
@@ -10,11 +10,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2005</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2006/news.xml b/de_DE.ISO8859-1/htdocs/news/2006/news.xml
index 7f594b929d..1d9b34ecf4 100644
--- a/de_DE.ISO8859-1/htdocs/news/2006/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2006/news.xml
@@ -26,11 +26,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2006</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2006/press.xml b/de_DE.ISO8859-1/htdocs/news/2006/press.xml
index 3abda5507c..1f60ce5564 100644
--- a/de_DE.ISO8859-1/htdocs/news/2006/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2006/press.xml
@@ -10,11 +10,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2006</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2007/news.xml b/de_DE.ISO8859-1/htdocs/news/2007/news.xml
index 086eb81168..06a7da4f54 100644
--- a/de_DE.ISO8859-1/htdocs/news/2007/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2007/news.xml
@@ -31,11 +31,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2007</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2007/press.xml b/de_DE.ISO8859-1/htdocs/news/2007/press.xml
index 0a3fafb582..b560fcd85c 100644
--- a/de_DE.ISO8859-1/htdocs/news/2007/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2007/press.xml
@@ -10,11 +10,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2007</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2008/news.xml b/de_DE.ISO8859-1/htdocs/news/2008/news.xml
index 218e47f3bf..8e26231bdd 100644
--- a/de_DE.ISO8859-1/htdocs/news/2008/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2008/news.xml
@@ -31,11 +31,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2008</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2008/press.xml b/de_DE.ISO8859-1/htdocs/news/2008/press.xml
index 7c6d717cd5..c72f742f17 100644
--- a/de_DE.ISO8859-1/htdocs/news/2008/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2008/press.xml
@@ -10,11 +10,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2008</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2009/news.xml b/de_DE.ISO8859-1/htdocs/news/2009/news.xml
index f10691a5a2..b7a4b7cd72 100644
--- a/de_DE.ISO8859-1/htdocs/news/2009/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2009/news.xml
@@ -31,11 +31,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2009</name>
diff --git a/de_DE.ISO8859-1/htdocs/news/2009/press.xml b/de_DE.ISO8859-1/htdocs/news/2009/press.xml
index c9de81b517..f049a91c3c 100644
--- a/de_DE.ISO8859-1/htdocs/news/2009/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2009/press.xml
@@ -11,11 +11,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2009</name>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/ia64/news.xml b/de_DE.ISO8859-1/htdocs/platforms/ia64/news.xml
index 5138903ef7..97f4760f53 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/ia64/news.xml
+++ b/de_DE.ISO8859-1/htdocs/platforms/ia64/news.xml
@@ -24,10 +24,8 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
 </news>
diff --git a/de_DE.ISO8859-1/share/sgml/news.xml b/de_DE.ISO8859-1/share/sgml/news.xml
index 840570d5e5..1ed621aaf0 100644
--- a/de_DE.ISO8859-1/share/sgml/news.xml
+++ b/de_DE.ISO8859-1/share/sgml/news.xml
@@ -31,11 +31,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2012</name>
diff --git a/de_DE.ISO8859-1/share/sgml/press.xml b/de_DE.ISO8859-1/share/sgml/press.xml
index 689af1cbd3..0ee9667099 100644
--- a/de_DE.ISO8859-1/share/sgml/press.xml
+++ b/de_DE.ISO8859-1/share/sgml/press.xml
@@ -11,11 +11,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2012</name>
diff --git a/de_DE.ISO8859-1/share/sgml/transtable.xml b/de_DE.ISO8859-1/share/sgml/transtable.xml
index 01b6162f78..e5267ab8b1 100644
--- a/de_DE.ISO8859-1/share/sgml/transtable.xml
+++ b/de_DE.ISO8859-1/share/sgml/transtable.xml
@@ -17,11 +17,9 @@
 -->
 
 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <group id="country">
     <word>
diff --git a/en_US.ISO8859-1/htdocs/gnome/news.xml b/en_US.ISO8859-1/htdocs/gnome/news.xml
index b115e31e67..f05a5dcadb 100644
--- a/en_US.ISO8859-1/htdocs/gnome/news.xml
+++ b/en_US.ISO8859-1/htdocs/gnome/news.xml
@@ -17,10 +17,7 @@ News//EN"
      the contents of <title> will be preferred over <p>.
 -->
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
-  version="1.0">
-    <cvs:keyword name="freebsd">$FreeBSD$</cvs:keyword>
-  </cvs:keywords>
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
 
   <year>
     <name>2010</name>
diff --git a/en_US.ISO8859-1/htdocs/java/news.xml b/en_US.ISO8859-1/htdocs/java/news.xml
index 41459caeb3..a1bc437d48 100644
--- a/en_US.ISO8859-1/htdocs/java/news.xml
+++ b/en_US.ISO8859-1/htdocs/java/news.xml
@@ -18,11 +18,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2012</name>
diff --git a/en_US.ISO8859-1/htdocs/news/1998/press.xml b/en_US.ISO8859-1/htdocs/news/1998/press.xml
index aa746b847b..223a91ce65 100644
--- a/en_US.ISO8859-1/htdocs/news/1998/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/1998/press.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>1998</name>
diff --git a/en_US.ISO8859-1/htdocs/news/1999/press.xml b/en_US.ISO8859-1/htdocs/news/1999/press.xml
index 2025cd48cd..69de9b0283 100644
--- a/en_US.ISO8859-1/htdocs/news/1999/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/1999/press.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>1999</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2000/press.xml b/en_US.ISO8859-1/htdocs/news/2000/press.xml
index 89074962af..d948d30af6 100644
--- a/en_US.ISO8859-1/htdocs/news/2000/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2000/press.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2000</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2001/news.xml b/en_US.ISO8859-1/htdocs/news/2001/news.xml
index 0e6dfe2b43..a96fa771e5 100644
--- a/en_US.ISO8859-1/htdocs/news/2001/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2001/news.xml
@@ -18,11 +18,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2001</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2001/press.xml b/en_US.ISO8859-1/htdocs/news/2001/press.xml
index b26fba1f60..46962e0143 100644
--- a/en_US.ISO8859-1/htdocs/news/2001/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2001/press.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2001</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2002/news.xml b/en_US.ISO8859-1/htdocs/news/2002/news.xml
index a70bba7a41..93b66a9a58 100644
--- a/en_US.ISO8859-1/htdocs/news/2002/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2002/news.xml
@@ -18,11 +18,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2002</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2002/press.xml b/en_US.ISO8859-1/htdocs/news/2002/press.xml
index a7202f66e3..db24921b96 100644
--- a/en_US.ISO8859-1/htdocs/news/2002/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2002/press.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2002</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2003/news.xml b/en_US.ISO8859-1/htdocs/news/2003/news.xml
index 0941785787..cf488467bd 100644
--- a/en_US.ISO8859-1/htdocs/news/2003/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2003/news.xml
@@ -18,11 +18,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2003</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2003/press.xml b/en_US.ISO8859-1/htdocs/news/2003/press.xml
index 28b79fb5d7..5c1b201cc4 100644
--- a/en_US.ISO8859-1/htdocs/news/2003/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2003/press.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2003</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2004/news.xml b/en_US.ISO8859-1/htdocs/news/2004/news.xml
index 03643e5aa8..f1811fc5d4 100644
--- a/en_US.ISO8859-1/htdocs/news/2004/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2004/news.xml
@@ -18,11 +18,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2004</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2004/press.xml b/en_US.ISO8859-1/htdocs/news/2004/press.xml
index fd3248dbc3..f2c52184de 100644
--- a/en_US.ISO8859-1/htdocs/news/2004/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2004/press.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2004</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2005/news.xml b/en_US.ISO8859-1/htdocs/news/2005/news.xml
index 4964a8a2a5..eb47a33352 100644
--- a/en_US.ISO8859-1/htdocs/news/2005/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2005/news.xml
@@ -18,11 +18,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2005</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2005/press.xml b/en_US.ISO8859-1/htdocs/news/2005/press.xml
index 513dd0550f..33cd197a35 100644
--- a/en_US.ISO8859-1/htdocs/news/2005/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2005/press.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2005</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2006/news.xml b/en_US.ISO8859-1/htdocs/news/2006/news.xml
index 1ee148cb3f..234a043980 100644
--- a/en_US.ISO8859-1/htdocs/news/2006/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2006/news.xml
@@ -18,11 +18,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2006</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2006/press.xml b/en_US.ISO8859-1/htdocs/news/2006/press.xml
index ef354531e7..264669095d 100644
--- a/en_US.ISO8859-1/htdocs/news/2006/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2006/press.xml
@@ -7,11 +7,9 @@
     "freefall:/c/www/bsddoc/press/".
 -->
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2006</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2007/news.xml b/en_US.ISO8859-1/htdocs/news/2007/news.xml
index 243dce1529..205530712e 100644
--- a/en_US.ISO8859-1/htdocs/news/2007/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2007/news.xml
@@ -18,11 +18,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2007</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2007/press.xml b/en_US.ISO8859-1/htdocs/news/2007/press.xml
index d5b7267818..b7a015a95b 100644
--- a/en_US.ISO8859-1/htdocs/news/2007/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2007/press.xml
@@ -7,11 +7,9 @@
     "freefall:/c/www/bsddoc/press/".
 -->
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2007</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2008/news.xml b/en_US.ISO8859-1/htdocs/news/2008/news.xml
index 7edef03e52..7b64d7485d 100644
--- a/en_US.ISO8859-1/htdocs/news/2008/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2008/news.xml
@@ -23,11 +23,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2008</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2008/press.xml b/en_US.ISO8859-1/htdocs/news/2008/press.xml
index d8a44dfee8..559e8cae5c 100644
--- a/en_US.ISO8859-1/htdocs/news/2008/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2008/press.xml
@@ -7,11 +7,9 @@
     "freefall:/c/www/bsddoc/press/".
 -->
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2008</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2009/news.xml b/en_US.ISO8859-1/htdocs/news/2009/news.xml
index 7c9e087d29..ebb312ac8e 100644
--- a/en_US.ISO8859-1/htdocs/news/2009/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2009/news.xml
@@ -23,11 +23,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2009</name>
diff --git a/en_US.ISO8859-1/htdocs/news/2009/press.xml b/en_US.ISO8859-1/htdocs/news/2009/press.xml
index 6f356a6b32..54cc3e1700 100644
--- a/en_US.ISO8859-1/htdocs/news/2009/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2009/press.xml
@@ -7,11 +7,9 @@
     "freefall:/c/www/bsddoc/press/".
 -->
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2009</name>
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2001-06.xml b/en_US.ISO8859-1/htdocs/news/status/report-2001-06.xml
index 3b4445ef6c..aa9bf80ecf 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-06.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-06.xml
@@ -11,11 +11,9 @@
     <year>2001</year>
   </date>
 
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <section>
     <title>Introduction</title>
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2001-07.xml b/en_US.ISO8859-1/htdocs/news/status/report-2001-07.xml
index fbef864b14..7b52884b55 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-07.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-07.xml
@@ -11,11 +11,9 @@
     <year>2001</year>
   </date>
 
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <section>
     <title>Introduction</title>
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2001-08.xml b/en_US.ISO8859-1/htdocs/news/status/report-2001-08.xml
index 48485a5f46..c8eb7f40e6 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-08.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-08.xml
@@ -11,11 +11,9 @@
     <year>2001</year>
   </date>
 
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <section>
     <title>Introduction</title>
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2001-09.xml b/en_US.ISO8859-1/htdocs/news/status/report-2001-09.xml
index 543273f567..b679cc03ae 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-09.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-09.xml
@@ -11,10 +11,7 @@
     <year>2001</year>
   </date>
 
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
-  version="1.0">
-    <cvs:keyword name="freebsd">$FreeBSD$</cvs:keyword>
-  </cvs:keywords>
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
 
   <section>
     <title>Introduction</title>
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2001-12-2002-01.xml b/en_US.ISO8859-1/htdocs/news/status/report-2001-12-2002-01.xml
index c799683d4a..3131517faa 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-12-2002-01.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-12-2002-01.xml
@@ -11,11 +11,9 @@
     <year></year> <!-- XXX -->
   </date>
 
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <section>
     <title>Introduction</title>
diff --git a/en_US.ISO8859-1/htdocs/platforms/ia64/news.xml b/en_US.ISO8859-1/htdocs/platforms/ia64/news.xml
index 5a1c1442e1..f5f781768e 100644
--- a/en_US.ISO8859-1/htdocs/platforms/ia64/news.xml
+++ b/en_US.ISO8859-1/htdocs/platforms/ia64/news.xml
@@ -18,10 +18,8 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
 </news>
diff --git a/en_US.ISO8859-1/htdocs/projects/ideas/ideas.xml b/en_US.ISO8859-1/htdocs/projects/ideas/ideas.xml
index 00285f4d9f..5fdbaa1f4b 100644
--- a/en_US.ISO8859-1/htdocs/projects/ideas/ideas.xml
+++ b/en_US.ISO8859-1/htdocs/projects/ideas/ideas.xml
@@ -13,11 +13,9 @@ Ideas//EN"
 -->
 
 <ideas>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <category>
     <title>Embedded</title>
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/news.xml b/fr_FR.ISO8859-1/htdocs/gnome/news.xml
index beac8d8da8..3c621a7a1c 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/news.xml
+++ b/fr_FR.ISO8859-1/htdocs/gnome/news.xml
@@ -26,11 +26,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2002</name>
diff --git a/fr_FR.ISO8859-1/htdocs/news/2001/news.xml b/fr_FR.ISO8859-1/htdocs/news/2001/news.xml
index 6acd554eeb..8ce94a5faf 100644
--- a/fr_FR.ISO8859-1/htdocs/news/2001/news.xml
+++ b/fr_FR.ISO8859-1/htdocs/news/2001/news.xml
@@ -37,11 +37,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2001</name>
diff --git a/fr_FR.ISO8859-1/htdocs/news/2002/news.xml b/fr_FR.ISO8859-1/htdocs/news/2002/news.xml
index a7ae64e5d3..7eea34aafb 100644
--- a/fr_FR.ISO8859-1/htdocs/news/2002/news.xml
+++ b/fr_FR.ISO8859-1/htdocs/news/2002/news.xml
@@ -37,11 +37,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2002</name>
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/ia64/news.xml b/fr_FR.ISO8859-1/htdocs/platforms/ia64/news.xml
index dbd5ea6257..7b1f8cceb3 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/ia64/news.xml
+++ b/fr_FR.ISO8859-1/htdocs/platforms/ia64/news.xml
@@ -26,10 +26,8 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
 </news>
diff --git a/fr_FR.ISO8859-1/share/sgml/events.xml b/fr_FR.ISO8859-1/share/sgml/events.xml
index 0999423027..043ccf6220 100644
--- a/fr_FR.ISO8859-1/share/sgml/events.xml
+++ b/fr_FR.ISO8859-1/share/sgml/events.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="sucon-2004">
     <name>2�me Conf�rence Unix Helv�tique</name>
diff --git a/fr_FR.ISO8859-1/share/sgml/news.xml b/fr_FR.ISO8859-1/share/sgml/news.xml
index 901ad5c6da..585b91ae24 100644
--- a/fr_FR.ISO8859-1/share/sgml/news.xml
+++ b/fr_FR.ISO8859-1/share/sgml/news.xml
@@ -42,11 +42,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2004</name>
diff --git a/fr_FR.ISO8859-1/share/sgml/press.xml b/fr_FR.ISO8859-1/share/sgml/press.xml
index 6f046c6f1d..5ff0f9c0e8 100644
--- a/fr_FR.ISO8859-1/share/sgml/press.xml
+++ b/fr_FR.ISO8859-1/share/sgml/press.xml
@@ -16,11 +16,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2004</name>
diff --git a/fr_FR.ISO8859-1/share/sgml/transtable.xml b/fr_FR.ISO8859-1/share/sgml/transtable.xml
index 40b919d04f..b975db8854 100644
--- a/fr_FR.ISO8859-1/share/sgml/transtable.xml
+++ b/fr_FR.ISO8859-1/share/sgml/transtable.xml
@@ -23,11 +23,9 @@
 -->
 
 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword>
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
 <!--
   <word>
diff --git a/hu_HU.ISO8859-2/htdocs/news/2008/press.xml b/hu_HU.ISO8859-2/htdocs/news/2008/press.xml
index ff77cfe069..b692d41311 100644
--- a/hu_HU.ISO8859-2/htdocs/news/2008/press.xml
+++ b/hu_HU.ISO8859-2/htdocs/news/2008/press.xml
@@ -9,11 +9,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2008</name>
diff --git a/hu_HU.ISO8859-2/htdocs/news/2009/news.xml b/hu_HU.ISO8859-2/htdocs/news/2009/news.xml
index 6459695ac5..34d1c695d7 100644
--- a/hu_HU.ISO8859-2/htdocs/news/2009/news.xml
+++ b/hu_HU.ISO8859-2/htdocs/news/2009/news.xml
@@ -9,11 +9,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2009</name>
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/ia64/news.xml b/hu_HU.ISO8859-2/htdocs/platforms/ia64/news.xml
index 365c161771..25b1d3b0f1 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/ia64/news.xml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/ia64/news.xml
@@ -18,10 +18,8 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
 </news>
diff --git a/hu_HU.ISO8859-2/share/sgml/events.xml b/hu_HU.ISO8859-2/share/sgml/events.xml
index e9929617e2..d6d0bd7842 100644
--- a/hu_HU.ISO8859-2/share/sgml/events.xml
+++ b/hu_HU.ISO8859-2/share/sgml/events.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="bsdcan-2013">
     <name>BSDCan 2013</name>
diff --git a/hu_HU.ISO8859-2/share/sgml/news.xml b/hu_HU.ISO8859-2/share/sgml/news.xml
index 8b0727c0bf..ff0ada1563 100644
--- a/hu_HU.ISO8859-2/share/sgml/news.xml
+++ b/hu_HU.ISO8859-2/share/sgml/news.xml
@@ -9,11 +9,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2010</name>
diff --git a/hu_HU.ISO8859-2/share/sgml/press.xml b/hu_HU.ISO8859-2/share/sgml/press.xml
index 43defecfe3..ea5cacd986 100644
--- a/hu_HU.ISO8859-2/share/sgml/press.xml
+++ b/hu_HU.ISO8859-2/share/sgml/press.xml
@@ -9,11 +9,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2010</name>
diff --git a/hu_HU.ISO8859-2/share/sgml/transtable.xml b/hu_HU.ISO8859-2/share/sgml/transtable.xml
index fb807f8602..077e0c8188 100644
--- a/hu_HU.ISO8859-2/share/sgml/transtable.xml
+++ b/hu_HU.ISO8859-2/share/sgml/transtable.xml
@@ -22,11 +22,9 @@
 -->
 
 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <group id="continents">
     <word>
diff --git a/it_IT.ISO8859-15/share/sgml/transtable.xml b/it_IT.ISO8859-15/share/sgml/transtable.xml
index 5c012a8e32..4013dabbd1 100644
--- a/it_IT.ISO8859-15/share/sgml/transtable.xml
+++ b/it_IT.ISO8859-15/share/sgml/transtable.xml
@@ -8,11 +8,9 @@
 -->
 
 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <group id="country">
     <word>
diff --git a/ja_JP.eucJP/htdocs/java/news.xml b/ja_JP.eucJP/htdocs/java/news.xml
index f71350e3e7..db9be0d85d 100644
--- a/ja_JP.eucJP/htdocs/java/news.xml
+++ b/ja_JP.eucJP/htdocs/java/news.xml
@@ -21,11 +21,9 @@
 <!-- Original revision: r38915 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2012</name>
diff --git a/ja_JP.eucJP/htdocs/news/2001/news.xml b/ja_JP.eucJP/htdocs/news/2001/news.xml
index 9a408c162f..ba70ab1b13 100644
--- a/ja_JP.eucJP/htdocs/news/2001/news.xml
+++ b/ja_JP.eucJP/htdocs/news/2001/news.xml
@@ -22,11 +22,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2001</name>
diff --git a/ja_JP.eucJP/htdocs/news/2001/press.xml b/ja_JP.eucJP/htdocs/news/2001/press.xml
index 5acfec826d..647c35c051 100644
--- a/ja_JP.eucJP/htdocs/news/2001/press.xml
+++ b/ja_JP.eucJP/htdocs/news/2001/press.xml
@@ -5,11 +5,9 @@
 <!-- Original revision: 1.2 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2001</name>
diff --git a/ja_JP.eucJP/htdocs/platforms/ia64/news.xml b/ja_JP.eucJP/htdocs/platforms/ia64/news.xml
index 2a7944c495..98a0ec3653 100644
--- a/ja_JP.eucJP/htdocs/platforms/ia64/news.xml
+++ b/ja_JP.eucJP/htdocs/platforms/ia64/news.xml
@@ -21,10 +21,8 @@
 <!-- Original revision: 1.2 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
 </news>
diff --git a/ja_JP.eucJP/share/sgml/news.xml b/ja_JP.eucJP/share/sgml/news.xml
index 5eafe877ed..ba61ca987a 100644
--- a/ja_JP.eucJP/share/sgml/news.xml
+++ b/ja_JP.eucJP/share/sgml/news.xml
@@ -23,11 +23,9 @@
      Original revision: r39063
 -->
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2012</name>
diff --git a/ja_JP.eucJP/share/sgml/press.xml b/ja_JP.eucJP/share/sgml/press.xml
index cc76661982..fba16250dc 100644
--- a/ja_JP.eucJP/share/sgml/press.xml
+++ b/ja_JP.eucJP/share/sgml/press.xml
@@ -4,11 +4,9 @@
 <!-- Original revision: 1.21 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2002</name>
diff --git a/ja_JP.eucJP/share/sgml/transtable.xml b/ja_JP.eucJP/share/sgml/transtable.xml
index ebd14f981f..4e61d8b06b 100644
--- a/ja_JP.eucJP/share/sgml/transtable.xml
+++ b/ja_JP.eucJP/share/sgml/transtable.xml
@@ -16,11 +16,9 @@
 -->
 
 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <group id="continents">
     <word>
diff --git a/mn_MN.UTF-8/share/sgml/transtable.xml b/mn_MN.UTF-8/share/sgml/transtable.xml
index 5a4a78fafe..65461b4c72 100644
--- a/mn_MN.UTF-8/share/sgml/transtable.xml
+++ b/mn_MN.UTF-8/share/sgml/transtable.xml
@@ -21,11 +21,9 @@
 -->
 
 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSDmn: freebsd_mn_doc/mn_MN-UTF-8/share/sgml/transtable.xml,v 0.1 2007/03/27 23:16:46 ganbold Exp $
     </cvs:keyword>
-  </cvs:keywords>
 
 <group id="country">
   <word>
diff --git a/nl_NL.ISO8859-1/share/sgml/transtable.xml b/nl_NL.ISO8859-1/share/sgml/transtable.xml
index 6d52170897..00ddb1b29f 100644
--- a/nl_NL.ISO8859-1/share/sgml/transtable.xml
+++ b/nl_NL.ISO8859-1/share/sgml/transtable.xml
@@ -23,11 +23,9 @@
 -->
 
 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <group id="country">
     <word>
diff --git a/ru_RU.KOI8-R/htdocs/gnome/news.xml b/ru_RU.KOI8-R/htdocs/gnome/news.xml
index 6d6ba35edd..c4a1368957 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/news.xml
+++ b/ru_RU.KOI8-R/htdocs/gnome/news.xml
@@ -27,11 +27,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2003</name>
diff --git a/ru_RU.KOI8-R/htdocs/news/1998/press.xml b/ru_RU.KOI8-R/htdocs/news/1998/press.xml
index 85dd2cdcdd..dc00c0a0ac 100644
--- a/ru_RU.KOI8-R/htdocs/news/1998/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/1998/press.xml
@@ -15,11 +15,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>1998</name>
diff --git a/ru_RU.KOI8-R/htdocs/news/1999/press.xml b/ru_RU.KOI8-R/htdocs/news/1999/press.xml
index 1b4d5db9fb..9b3642c042 100644
--- a/ru_RU.KOI8-R/htdocs/news/1999/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/1999/press.xml
@@ -15,11 +15,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>1999</name>
diff --git a/ru_RU.KOI8-R/htdocs/news/2000/press.xml b/ru_RU.KOI8-R/htdocs/news/2000/press.xml
index ef9fa709b7..aa009cea12 100644
--- a/ru_RU.KOI8-R/htdocs/news/2000/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2000/press.xml
@@ -15,11 +15,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2000</name>
diff --git a/ru_RU.KOI8-R/htdocs/news/2001/news.xml b/ru_RU.KOI8-R/htdocs/news/2001/news.xml
index f56a1db349..801feadc2e 100644
--- a/ru_RU.KOI8-R/htdocs/news/2001/news.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2001/news.xml
@@ -27,11 +27,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2001</name>
diff --git a/ru_RU.KOI8-R/htdocs/news/2001/press.xml b/ru_RU.KOI8-R/htdocs/news/2001/press.xml
index 7bfee6d101..bd2705ca2c 100644
--- a/ru_RU.KOI8-R/htdocs/news/2001/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2001/press.xml
@@ -15,11 +15,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2001</name>
diff --git a/ru_RU.KOI8-R/htdocs/news/2002/news.xml b/ru_RU.KOI8-R/htdocs/news/2002/news.xml
index 0e011219b5..0e7a124c7b 100644
--- a/ru_RU.KOI8-R/htdocs/news/2002/news.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2002/news.xml
@@ -27,11 +27,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2002</name>
diff --git a/ru_RU.KOI8-R/htdocs/news/2002/press.xml b/ru_RU.KOI8-R/htdocs/news/2002/press.xml
index 824dd61ed5..e6452aba62 100644
--- a/ru_RU.KOI8-R/htdocs/news/2002/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2002/press.xml
@@ -15,11 +15,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2002</name>
diff --git a/ru_RU.KOI8-R/htdocs/news/2003/news.xml b/ru_RU.KOI8-R/htdocs/news/2003/news.xml
index 6c7180d800..0685980c7f 100644
--- a/ru_RU.KOI8-R/htdocs/news/2003/news.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2003/news.xml
@@ -27,11 +27,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2003</name>
diff --git a/ru_RU.KOI8-R/htdocs/news/2003/press.xml b/ru_RU.KOI8-R/htdocs/news/2003/press.xml
index b991cbcd00..3c700b98ce 100644
--- a/ru_RU.KOI8-R/htdocs/news/2003/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2003/press.xml
@@ -15,11 +15,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2003</name>
diff --git a/ru_RU.KOI8-R/share/sgml/events.xml b/ru_RU.KOI8-R/share/sgml/events.xml
index f0549d4a5c..584da52771 100644
--- a/ru_RU.KOI8-R/share/sgml/events.xml
+++ b/ru_RU.KOI8-R/share/sgml/events.xml
@@ -15,11 +15,9 @@
 -->
 
 <events xmlns:xi="http://www.w3.org/2001/XInclude">
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <xi:include
     href="http://www.FreeBSD.org/XML/www/lang/share/sgml/events2013.xml"
diff --git a/ru_RU.KOI8-R/share/sgml/events2003.xml b/ru_RU.KOI8-R/share/sgml/events2003.xml
index 4a9aee4b7c..c480686797 100644
--- a/ru_RU.KOI8-R/share/sgml/events2003.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2003.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="ccc-20">
     <name>20. Chaos Communication Congress</name>
@@ -259,4 +257,4 @@
       <url>http://apollo.backplane.com/BSDCON2003/</url>
     </link>
   </event>
-</events>
\ No newline at end of file
+</events>
diff --git a/ru_RU.KOI8-R/share/sgml/events2004.xml b/ru_RU.KOI8-R/share/sgml/events2004.xml
index 216aaf566d..ada085d4f8 100644
--- a/ru_RU.KOI8-R/share/sgml/events2004.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2004.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="ccc-21">
     <name>21. Chaos Communication Congress</name>
@@ -453,4 +451,4 @@
       FreeBSD</a>, �������, ������� ��, ����� ������������
       FreeBSD!</description>
   </event>
-</events>
\ No newline at end of file
+</events>
diff --git a/ru_RU.KOI8-R/share/sgml/events2005.xml b/ru_RU.KOI8-R/share/sgml/events2005.xml
index 7cfd772128..9452c7b8e2 100644
--- a/ru_RU.KOI8-R/share/sgml/events2005.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2005.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="guficon-6">
     <name>GUFICon #6</name>
@@ -292,4 +290,4 @@
       ����������� �������-�����, ��������������� ��������� <a
       href="www.freebsdmall.com/">FreeBSD Mall</a>.</description>
   </event>
-</events>
\ No newline at end of file
+</events>
diff --git a/ru_RU.KOI8-R/share/sgml/events2006.xml b/ru_RU.KOI8-R/share/sgml/events2006.xml
index 7c588005dc..c69d785173 100644
--- a/ru_RU.KOI8-R/share/sgml/events2006.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2006.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="chilebsdcon-2006">
     <name>ChileBSDCon 2006</name>
@@ -510,4 +508,4 @@
       administration skills, including beginning Mail, BIND, and Apache
       administration.</description>
   </event>
-</events>
\ No newline at end of file
+</events>
diff --git a/ru_RU.KOI8-R/share/sgml/events2007.xml b/ru_RU.KOI8-R/share/sgml/events2007.xml
index 60fbe2c3ef..c418c6a8b5 100644
--- a/ru_RU.KOI8-R/share/sgml/events2007.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2007.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="meetbsd-2007">
     <name>MeetBSD 2007</name>
@@ -618,4 +616,4 @@
       and CDROMs provided by <a href="http://www.freebsdmall.com/">FreeBSD Mall</a>
       will be handed out.</description>
   </event>
-</events>
\ No newline at end of file
+</events>
diff --git a/ru_RU.KOI8-R/share/sgml/events2008.xml b/ru_RU.KOI8-R/share/sgml/events2008.xml
index 56d3a22d38..f6febcd251 100644
--- a/ru_RU.KOI8-R/share/sgml/events2008.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2008.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="nllgg-2008">
     <name>NLLGG-bijeenkomst december 2008</name>
@@ -547,4 +545,4 @@
 	will be present in the Association Village to promote FreeBSD 
 	of course !</description>
   </event>
-</events>
\ No newline at end of file
+</events>
diff --git a/ru_RU.KOI8-R/share/sgml/events2009.xml b/ru_RU.KOI8-R/share/sgml/events2009.xml
index 0ace9f0b29..2a79115d26 100644
--- a/ru_RU.KOI8-R/share/sgml/events2009.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2009.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="open-rheinruhr-2009">
     <name>OpenRheinRuhr 2009</name>
@@ -497,4 +495,4 @@
       through the all network-related problem reports in &os;'s GNATS
       database.</description>
   </event>
-</events>
\ No newline at end of file
+</events>
diff --git a/ru_RU.KOI8-R/share/sgml/events2010.xml b/ru_RU.KOI8-R/share/sgml/events2010.xml
index 3af8137bd0..85d17d8ce7 100644
--- a/ru_RU.KOI8-R/share/sgml/events2010.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2010.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="nllgg-2010">
     <name>NLLGG gathering</name>
@@ -492,4 +490,4 @@
       and Open Source developers a place to meet.  Several &os;
       developers will be present.</description>
   </event>
-</events>
\ No newline at end of file
+</events>
diff --git a/ru_RU.KOI8-R/share/sgml/events2011.xml b/ru_RU.KOI8-R/share/sgml/events2011.xml
index 1ec922e979..347ad9511b 100644
--- a/ru_RU.KOI8-R/share/sgml/events2011.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2011.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="bsdday-argentina-2011">
     <name>BSDday Argentina 2011</name>
@@ -254,4 +252,4 @@
       the latest developments in our open source community are shared with
       the widest possible audience.</description>
   </event>
-</events>
\ No newline at end of file
+</events>
diff --git a/ru_RU.KOI8-R/share/sgml/events2012.xml b/ru_RU.KOI8-R/share/sgml/events2012.xml
index e394e20c18..acfb027b34 100644
--- a/ru_RU.KOI8-R/share/sgml/events2012.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2012.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="bsdcan-2012">
     <name>BSDCan 2012</name>
diff --git a/ru_RU.KOI8-R/share/sgml/events2013.xml b/ru_RU.KOI8-R/share/sgml/events2013.xml
index 8e55b93ced..c590938202 100644
--- a/ru_RU.KOI8-R/share/sgml/events2013.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2013.xml
@@ -15,11 +15,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="bsdcan-2013">
     <name>BSDCan 2013</name>
@@ -46,4 +44,4 @@
       ��� ���������� ������������ �����������, ��� � ������������
       ���������.</description>
   </event>
-</events>
\ No newline at end of file
+</events>
diff --git a/ru_RU.KOI8-R/share/sgml/news.xml b/ru_RU.KOI8-R/share/sgml/news.xml
index 908b0e474b..54d8a68cb7 100644
--- a/ru_RU.KOI8-R/share/sgml/news.xml
+++ b/ru_RU.KOI8-R/share/sgml/news.xml
@@ -29,11 +29,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2005</name>
diff --git a/ru_RU.KOI8-R/share/sgml/press.xml b/ru_RU.KOI8-R/share/sgml/press.xml
index b88c8dbe48..0cd1fadd02 100644
--- a/ru_RU.KOI8-R/share/sgml/press.xml
+++ b/ru_RU.KOI8-R/share/sgml/press.xml
@@ -17,11 +17,9 @@
 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2005</name>
diff --git a/ru_RU.KOI8-R/share/sgml/transtable.xml b/ru_RU.KOI8-R/share/sgml/transtable.xml
index ccf97de170..969890886a 100644
--- a/ru_RU.KOI8-R/share/sgml/transtable.xml
+++ b/ru_RU.KOI8-R/share/sgml/transtable.xml
@@ -22,11 +22,9 @@
 -->
 
 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
 <group id="country">
   <word>
diff --git a/share/sgml/advisories.xml b/share/sgml/advisories.xml
index 99d9fecf37..d7a4e586c9 100644
--- a/share/sgml/advisories.xml
+++ b/share/sgml/advisories.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <advisories>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2012</name>
diff --git a/share/sgml/catalog.xml b/share/sgml/catalog.xml
index f299f9d1fd..7dd342c033 100644
--- a/share/sgml/catalog.xml
+++ b/share/sgml/catalog.xml
@@ -50,6 +50,9 @@
   <public
         publicId="-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
         uri="xslt10-freebsd.dtd" />
+  <public
+	publicId="-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+        uri="cvs.dtd"/>
   <public
         publicId="-//FreeBSD//DTD FreeBSD XML Database for UserGroups//EN"
         uri="usergroups.dtd" />
diff --git a/share/sgml/commercial.consult.xml b/share/sgml/commercial.consult.xml
index 20d6cab624..d5824c8cb9 100644
--- a/share/sgml/commercial.consult.xml
+++ b/share/sgml/commercial.consult.xml
@@ -4,11 +4,9 @@
 <!-- $FreeBSD$ -->
 
 <entries>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <categories>
     <category id="africa">Africa</category>
diff --git a/share/sgml/commercial.hardware.xml b/share/sgml/commercial.hardware.xml
index a94f710bf4..875fcac1a8 100644
--- a/share/sgml/commercial.hardware.xml
+++ b/share/sgml/commercial.hardware.xml
@@ -4,11 +4,9 @@
 <!-- $FreeBSD$ -->
 
 <entries>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <entry id="ABMX">
     <name>ABMX Servers</name>
diff --git a/share/sgml/commercial.isp.xml b/share/sgml/commercial.isp.xml
index 6a9e61271f..694f3bc6f4 100644
--- a/share/sgml/commercial.isp.xml
+++ b/share/sgml/commercial.isp.xml
@@ -4,11 +4,9 @@
 <!-- $FreeBSD$ -->
 
 <entries>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <entry id="astute">
     <name>Astute Hosting Incorporated</name>
diff --git a/share/sgml/commercial.misc.xml b/share/sgml/commercial.misc.xml
index 204c30767b..20ba173aa9 100644
--- a/share/sgml/commercial.misc.xml
+++ b/share/sgml/commercial.misc.xml
@@ -4,11 +4,9 @@
 <!-- $FreeBSD$ -->
 
 <entries>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <entry id="FreeBSDMall">
     <name>FreeBSD Mall</name>
diff --git a/share/sgml/commercial.software.xml b/share/sgml/commercial.software.xml
index cff0a47727..0698b11374 100644
--- a/share/sgml/commercial.software.xml
+++ b/share/sgml/commercial.software.xml
@@ -4,11 +4,9 @@
 <!-- $FreeBSD$ -->
 
 <entries>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <categories>
     <category id="DATABASE">Databases</category>
diff --git a/share/sgml/cvs.dtd b/share/sgml/cvs.dtd
new file mode 100644
index 0000000000..219505d76d
--- /dev/null
+++ b/share/sgml/cvs.dtd
@@ -0,0 +1,3 @@
+<!ELEMENT cvs:keyword (#PCDATA)>
+<!ATTLIST cvs:keyword xmlns CDATA #IMPLIED>
+<!ATTLIST cvs:keyword xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
diff --git a/share/sgml/events.dtd b/share/sgml/events.dtd
index e76e1efb4c..3e2e7753ee 100644
--- a/share/sgml/events.dtd
+++ b/share/sgml/events.dtd
@@ -27,7 +27,7 @@
 
 <!-- DTD for events.xml on the FreeBSD website. -->
 
-<!ELEMENT events (cvs:keywords?, event+)>
+<!ELEMENT events (cvs:keyword?, event+)>
 
 <!ELEMENT event (name?, url?, startdate, enddate, location, description?, link*)>
 <!ATTLIST event id ID #REQUIRED>
@@ -74,13 +74,10 @@
 <!ELEMENT link (name, url)>
 <!ATTLIST link type (photos|notes|other) "other">
 
-<!-- Common CVS tags -->
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;
 
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
diff --git a/share/sgml/events.xml b/share/sgml/events.xml
index 82106592bd..0695d1e53f 100644
--- a/share/sgml/events.xml
+++ b/share/sgml/events.xml
@@ -8,11 +8,9 @@
 -->
 
 <events xmlns:xi="http://www.w3.org/2001/XInclude">
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <xi:include
     href="http://www.FreeBSD.org/XML/www/share/sgml/events2013.xml"
diff --git a/share/sgml/events2003.xml b/share/sgml/events2003.xml
index 32b4826b0a..00f82491a1 100644
--- a/share/sgml/events2003.xml
+++ b/share/sgml/events2003.xml
@@ -8,11 +8,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="ccc-20">
     <name>20. Chaos Communication Congress</name>
diff --git a/share/sgml/events2004.xml b/share/sgml/events2004.xml
index bd8f4776aa..a546be46bf 100644
--- a/share/sgml/events2004.xml
+++ b/share/sgml/events2004.xml
@@ -8,11 +8,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="ccc-21">
     <name>21. Chaos Communication Congress</name>
diff --git a/share/sgml/events2005.xml b/share/sgml/events2005.xml
index ac117a40f1..644100da29 100644
--- a/share/sgml/events2005.xml
+++ b/share/sgml/events2005.xml
@@ -8,11 +8,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="guficon-6">
     <name>GUFICon #6</name>
diff --git a/share/sgml/events2006.xml b/share/sgml/events2006.xml
index e0f378c46e..504d637d13 100644
--- a/share/sgml/events2006.xml
+++ b/share/sgml/events2006.xml
@@ -8,11 +8,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="chilebsdcon-2006">
     <name>ChileBSDCon 2006</name>
diff --git a/share/sgml/events2007.xml b/share/sgml/events2007.xml
index 9d0b40fd71..90e0113ca8 100644
--- a/share/sgml/events2007.xml
+++ b/share/sgml/events2007.xml
@@ -8,11 +8,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="meetbsd-2007">
     <name>MeetBSD 2007</name>
diff --git a/share/sgml/events2008.xml b/share/sgml/events2008.xml
index 1608cda34f..d25b427e04 100644
--- a/share/sgml/events2008.xml
+++ b/share/sgml/events2008.xml
@@ -8,11 +8,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="nllgg-2008">
     <name>NLLGG-bijeenkomst december 2008</name>
diff --git a/share/sgml/events2009.xml b/share/sgml/events2009.xml
index c6671bcbf2..1e6e277cb6 100644
--- a/share/sgml/events2009.xml
+++ b/share/sgml/events2009.xml
@@ -8,11 +8,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="open-rheinruhr-2009">
     <name>OpenRheinRuhr 2009</name>
diff --git a/share/sgml/events2010.xml b/share/sgml/events2010.xml
index b7e912fc03..dd635e35d8 100644
--- a/share/sgml/events2010.xml
+++ b/share/sgml/events2010.xml
@@ -8,11 +8,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="nllgg-2010">
     <name>NLLGG gathering</name>
diff --git a/share/sgml/events2011.xml b/share/sgml/events2011.xml
index 4813b7b739..3ef4a644fb 100644
--- a/share/sgml/events2011.xml
+++ b/share/sgml/events2011.xml
@@ -8,11 +8,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="bsdday-argentina-2011">
     <name>BSDday Argentina 2011</name>
diff --git a/share/sgml/events2012.xml b/share/sgml/events2012.xml
index a27a7276e0..5a79ce3c01 100644
--- a/share/sgml/events2012.xml
+++ b/share/sgml/events2012.xml
@@ -8,11 +8,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="chemnitz-linux-days-2012">
     <name>Chemnitz Linux Days 2012</name>
diff --git a/share/sgml/events2013.xml b/share/sgml/events2013.xml
index 19ee438ec4..254ea8e4e7 100644
--- a/share/sgml/events2013.xml
+++ b/share/sgml/events2013.xml
@@ -8,11 +8,9 @@
 -->
 
 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <event id="bsdcan-2013">
     <name>BSDCan 2013</name>
diff --git a/share/sgml/gallery.dtd b/share/sgml/gallery.dtd
index 879d853754..91ea1b068a 100644
--- a/share/sgml/gallery.dtd
+++ b/share/sgml/gallery.dtd
@@ -1,7 +1,7 @@
 <!-- DTD for commercial gallery entries on the FreeBSD website. -->
 <!-- $FreeBSD$ -->
 
-<!ELEMENT entries (cvs:keywords?, categories?, entry+)>
+<!ELEMENT entries (cvs:keyword?, categories?, entry+)>
 
 <!ELEMENT categories (category)+>
 <!ATTLIST categories
@@ -40,13 +40,10 @@
 <!ATTLIST img alt CDATA #IMPLIED>
 <!ATTLIST img src CDATA #REQUIRED>
 
-<!-- common cvs tags -->
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;
 
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
diff --git a/share/sgml/ideas.dtd b/share/sgml/ideas.dtd
index 013666e0f3..34b0b38d8a 100644
--- a/share/sgml/ideas.dtd
+++ b/share/sgml/ideas.dtd
@@ -1,13 +1,6 @@
 <!-- $FreeBSD$ -->
 
-<!ELEMENT ideas (cvs:keywords?, category)+>
-
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
+<!ELEMENT ideas (cvs:keyword?, category)+>
 
 <!ELEMENT title (#PCDATA)>
 <!ATTLIST title
@@ -29,6 +22,11 @@
   id		ID	#IMPLIED
 >
 
+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;
+
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
         "http://www.FreeBSD.org/XML/cwd/autogen.ent">
diff --git a/share/sgml/mirrors.xml b/share/sgml/mirrors.xml
index e56b4b5b06..b9178d2317 100644
--- a/share/sgml/mirrors.xml
+++ b/share/sgml/mirrors.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <mirrors>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <entry id="central">
     <country role="primary">Central Servers</country>
diff --git a/share/sgml/news.dtd b/share/sgml/news.dtd
index 080dcf67d9..84160525ce 100644
--- a/share/sgml/news.dtd
+++ b/share/sgml/news.dtd
@@ -3,14 +3,7 @@
 <!ENTITY lists 'http://lists.freebsd.org/pipermail'>
 <!ENTITY lists.stable '&lists;/freebsd-stable'>
 
-<!ELEMENT news (cvs:keywords?, year)+>
-
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
+<!ELEMENT news (cvs:keyword?, year)+>
 
 <!ELEMENT name (#PCDATA)>
 <!ATTLIST name
@@ -58,6 +51,11 @@
   id		ID	#IMPLIED
 >
 
+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;
+
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
         "http://www.FreeBSD.org/XML/cwd/autogen.ent">
diff --git a/share/sgml/news.xml b/share/sgml/news.xml
index 853734fe1a..98a59905ce 100644
--- a/share/sgml/news.xml
+++ b/share/sgml/news.xml
@@ -23,11 +23,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2012</name>
diff --git a/share/sgml/notices.xml b/share/sgml/notices.xml
index fc0bac9abe..64633c4ec0 100644
--- a/share/sgml/notices.xml
+++ b/share/sgml/notices.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <advisories>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2012</name>
diff --git a/share/sgml/press.dtd b/share/sgml/press.dtd
index 81ac140f34..18f06321c5 100644
--- a/share/sgml/press.dtd
+++ b/share/sgml/press.dtd
@@ -1,13 +1,6 @@
 <!-- $FreeBSD$ -->
 
-<!ELEMENT press (cvs:keywords?, year)+>
-
-<!ELEMENT cvs:keywords (cvs:keyword+)>
-<!ATTLIST cvs:keywords xmlns:cvs CDATA #FIXED 'http://www.FreeBSD.org/XML/CVS'>
-<!ATTLIST cvs:keywords version CDATA #FIXED '1.0'>
-
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword name CDATA #REQUIRED>
+<!ELEMENT press (cvs:keyword?, year)+>
 
 <!ELEMENT year (name, (month)+)>
 <!ATTLIST year
@@ -65,6 +58,11 @@
   href		CDATA	#REQUIRED
 >
 
+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;
+
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
         "http://www.FreeBSD.org/XML/cwd/autogen.ent">
diff --git a/share/sgml/press.xml b/share/sgml/press.xml
index 1eb4d9c39e..8e32b1fde6 100644
--- a/share/sgml/press.xml
+++ b/share/sgml/press.xml
@@ -7,11 +7,9 @@
     "freefall:/c/www/bsddoc/press/".
 -->
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2012</name>
diff --git a/share/sgml/sitemap.dtd b/share/sgml/sitemap.dtd
index 5db534a21d..8769f56a15 100644
--- a/share/sgml/sitemap.dtd
+++ b/share/sgml/sitemap.dtd
@@ -11,10 +11,10 @@
 <!ELEMENT text (#PCDATA)>
 <!ELEMENT destination (#PCDATA)>
 
-<!-- Subversion keyword tag -->
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword xmlns CDATA #IMPLIED>
-<!ATTLIST cvs:keyword xmlns:cvs CDATA #IMPLIED>
+<!ENTITY % cvs
+ PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+	"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;
 
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
diff --git a/share/sgml/transtable.xml b/share/sgml/transtable.xml
index c1a1b99950..54320c13aa 100644
--- a/share/sgml/transtable.xml
+++ b/share/sgml/transtable.xml
@@ -16,11 +16,9 @@
 -->
 
 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <group id="number-month">
     <word>
diff --git a/share/sgml/usergroups.xml b/share/sgml/usergroups.xml
index 0601ddfb86..9cd6efcd9b 100644
--- a/share/sgml/usergroups.xml
+++ b/share/sgml/usergroups.xml
@@ -3,11 +3,9 @@
                             "http://www.FreeBSD.org/XML/www/share/sgml/usergoups.dtd">
 
 <usergroups>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
 <!--
 
diff --git a/share/sgml/xhtml10-freebsd.dtd b/share/sgml/xhtml10-freebsd.dtd
index a3aa5006a8..fd403ec3ee 100644
--- a/share/sgml/xhtml10-freebsd.dtd
+++ b/share/sgml/xhtml10-freebsd.dtd
@@ -44,10 +44,9 @@
   xmlns	      CDATA          #IMPLIED"
   >
 
-<!-- Subversion keyword tag -->
-<!ELEMENT cvs:keyword (#PCDATA)>
-<!ATTLIST cvs:keyword xmlns CDATA #IMPLIED>
-<!ATTLIST cvs:keyword xmlns:cvs CDATA #IMPLIED>
+<!ENTITY % cvs PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">
+%cvs;
 
 <!ENTITY % head.misc "(cvs:keyword|script|style|meta|link|object|isindex)*">
 
diff --git a/zh_CN.GB2312/share/sgml/news.xml b/zh_CN.GB2312/share/sgml/news.xml
index cc81829963..84de62fa26 100644
--- a/zh_CN.GB2312/share/sgml/news.xml
+++ b/zh_CN.GB2312/share/sgml/news.xml
@@ -25,11 +25,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2007</name>
diff --git a/zh_CN.GB2312/share/sgml/press.xml b/zh_CN.GB2312/share/sgml/press.xml
index 06eb684563..7987b7768a 100644
--- a/zh_CN.GB2312/share/sgml/press.xml
+++ b/zh_CN.GB2312/share/sgml/press.xml
@@ -11,11 +11,9 @@
 <!-- Original Revision 1.48 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2007</name>
diff --git a/zh_CN.GB2312/share/sgml/transtable.xml b/zh_CN.GB2312/share/sgml/transtable.xml
index b5b85c9d77..1a221842ad 100644
--- a/zh_CN.GB2312/share/sgml/transtable.xml
+++ b/zh_CN.GB2312/share/sgml/transtable.xml
@@ -17,11 +17,9 @@
 -->
 
 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <group id="country">
     <word>
diff --git a/zh_TW.Big5/share/sgml/news.xml b/zh_TW.Big5/share/sgml/news.xml
index 4bce625a2b..c6fb420ef3 100644
--- a/zh_TW.Big5/share/sgml/news.xml
+++ b/zh_TW.Big5/share/sgml/news.xml
@@ -25,11 +25,9 @@
 -->
 
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2006</name>
diff --git a/zh_TW.Big5/share/sgml/press.xml b/zh_TW.Big5/share/sgml/press.xml
index f58a89cd90..3e3a24e92d 100644
--- a/zh_TW.Big5/share/sgml/press.xml
+++ b/zh_TW.Big5/share/sgml/press.xml
@@ -11,11 +11,9 @@
 <!-- Original Revision 1.20 -->
 
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
     </cvs:keyword>
-  </cvs:keywords>
 
   <year>
     <name>2006</name>