diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
index 2d2f4425cf..cfc820889b 100644
--- a/docs/schemas/basictypes.rng
+++ b/docs/schemas/basictypes.rng
@@ -231,4 +231,38 @@
     </data>
   </define>
 
+  <define name='archnames'>
+    <choice>
+      <value>alpha</value>
+      <value>armv7l</value>
+      <value>cris</value>
+      <value>i686</value>
+      <value>ia64</value>
+      <value>lm32</value>
+      <value>m68k</value>
+      <value>microblaze</value>
+      <value>microblazeel</value>
+      <value>mips</value>
+      <value>mipsel</value>
+      <value>mips64</value>
+      <value>mips64el</value>
+      <value>openrisc</value>
+      <value>parisc</value>
+      <value>parisc64</value>
+      <value>ppc</value>
+      <value>ppc64</value>
+      <value>ppcemb</value>
+      <value>s390</value>
+      <value>s390x</value>
+      <value>sh4</value>
+      <value>sh4eb</value>
+      <value>sparc</value>
+      <value>sparc64</value>
+      <value>unicore32</value>
+      <value>x86_64</value>
+      <value>xtensa</value>
+      <value>xtensaeb</value>
+    </choice>
+  </define>
+
 </grammar>
diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index 53fb04acbd..8f3fbd9ae2 100644
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -367,23 +367,6 @@
     </attribute>
   </define>
 
-  <define name='archnames'>
-    <choice>
-      <value>arm</value>
-      <value>i686</value>
-      <value>ia64</value>
-      <value>microblaze</value>
-      <value>microblazeel</value>
-      <value>mips</value>
-      <value>mipsel</value>
-      <value>ppc64</value>
-      <value>ppc</value>
-      <value>s390</value>
-      <value>sparc</value>
-      <value>x86_64</value>
-    </choice>
-  </define>
-
   <define name='featureName'>
     <data type='string'>
       <param name='pattern'>[a-zA-Z0-9\-_]+</param>