diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 09d1c2d467..4fbb461bc5 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -2186,23 +2186,23 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
 	mandate:</para>
 
 	<blockquote>
-	  <para>Our 32-bit reference platform is i386, and our 64-bit
-	    reference platform is Sparc64.  Major design work (including
+	  <para>Our 32-bit reference platform is &arch.i386;, and our 64-bit
+	    reference platform is &arch.sparc64;.  Major design work (including
 	    major API and ABI changes) must prove itself on at least one
 	    32-bit and at least one 64-bit platform, preferably the
 	    primary reference platforms, before it may be committed
 	    to the source tree.</para>
 	</blockquote>
 
-      <para>The i386 and Sparc64 platforms were chosen due to being more
+      <para>The &arch.i386; and &arch.sparc64; platforms were chosen due to being more
 	readily available to developers and as representatives of more
 	diverse processor and system designs - big vs little endian,
 	register file vs register stack, different DMA and cache
 	implementations, hardware page tables vs software TLB management
 	etc.</para>
 
-      <para>The ia64 platform has many of the same complications that
-	Sparc64 has, but is still limited in availability to
+      <para>The &arch.ia64; platform has many of the same complications that
+	&arch.sparc64; has, but is still limited in availability to
 	developers.</para>
 
       <para>We will continue to re-evaluate this policy as cost and
@@ -2362,7 +2362,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
         documents.  All relevant integration documentation must also
         be integrated into the tree, or readily available.</para>
 
-      <para>Current Tier 1 platforms are i386, AMD64, and PC98.</para>
+      <para>Current Tier 1 platforms are &arch.i386; and &arch.amd64;.</para>
     </sect2>
 
     <sect2>
@@ -2414,7 +2414,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
         old.  It should be integrated into the FreeBSD
         documentation.</para>
 
-      <para>Current Tier 2 platforms are ARM, PowerPC, ia64, and Sparc64.</para>
+      <para>Current Tier 2 platforms are &arch.arm;, &arch.ia64;, &arch.pc98;, &arch.powerpc;, and &arch.sparc64;.</para>
     </sect2>
 
     <sect2>
@@ -2443,7 +2443,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
         hardware or emulation environment.  This documentation need
         not be integrated into the FreeBSD tree.</para>
 
-      <para>Current Tier 3 platforms are MIPS and &s390;.</para>
+      <para>Current Tier 3 platforms are &arch.mips; and &s390;.</para>
     </sect2>
 
     <sect2>
diff --git a/share/sgml/freebsd.ent b/share/sgml/freebsd.ent
index ada002ef4f..4ba32f2a6c 100644
--- a/share/sgml/freebsd.ent
+++ b/share/sgml/freebsd.ent
@@ -27,6 +27,7 @@ used in both environments.
 <!ENTITY arch.arm "arm">
 <!ENTITY arch.i386 "i386">
 <!ENTITY arch.ia64 "ia64">
+<!ENTITY arch.mips "mips">
 <!ENTITY arch.pc98 "pc98">
 <!ENTITY arch.powerpc "powerpc">
 <!ENTITY arch.sparc64 "sparc64">