diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index 3e8944c392..378652e5ad 100644
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -25,6 +25,9 @@
 	<optional>
 	  <ref name='cpufeatures'/>
 	</optional>
+	<optional>
+	  <ref name='cpuspec'/>
+	</optional>
       </element>
       <optional>
 	<ref name='migration'/>
@@ -67,6 +70,31 @@
     </element>
   </define>
 
+  <define name='cpuspec'>
+    <element name='model'>
+      <text/>
+    </element>
+    <element name='topology'>
+      <attribute name='sockets'>
+        <ref name='positiveInteger'/>
+      </attribute>
+      <attribute name='cores'>
+        <ref name='positiveInteger'/>
+      </attribute>
+      <attribute name='threads'>
+        <ref name='positiveInteger'/>
+      </attribute>
+    </element>
+    <zeroOrMore>
+      <element name='feature'>
+        <attribute name='name'>
+          <ref name='featureName'/>
+        </attribute>
+        <empty/>
+      </element>
+    </zeroOrMore>
+  </define>
+
   <define name='migration'>
     <element name='migration_features'>
       <optional>
@@ -259,6 +287,11 @@
 	  <empty/>
 	</element>
       </optional>
+      <optional>
+        <element name='cpuselection'>
+          <empty/>
+        </element>
+      </optional>
     </element>
   </define>
 
@@ -293,8 +326,14 @@
   </define>
 
 
+  <define name='positiveInteger'>
+    <data type='positiveInteger'>
+      <param name="pattern">[0-9]+</param>
+    </data>
+  </define>
+
   <define name='uint'>
-    <data type='string'>
+    <data type='unsignedInt'>
       <param name="pattern">[0-9]+</param>
     </data>
   </define>
@@ -305,4 +344,9 @@
     </data>
   </define>
 
+  <define name='featureName'>
+    <data type='string'>
+      <param name='pattern'>[a-zA-Z0-9\-_]+</param>
+    </data>
+  </define>
 </grammar>
diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index 784f9b1a55..566b11753c 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -27,6 +27,9 @@
         <optional>
           <ref name="description"/>
         </optional>
+        <optional>
+          <ref name="cpu"/>
+        </optional>
         <ref name="os"/>
         <ref name="clock"/>
         <ref name="resources"/>
@@ -1234,6 +1237,55 @@
       </element>
     </optional>
   </define>
+  <!--
+      CPU specification
+      -->
+  <define name="cpu">
+    <element name="cpu">
+      <attribute name="match">
+        <choice>
+          <value>minimum</value>
+          <value>exact</value>
+          <value>strict</value>
+        </choice>
+      </attribute>
+      <interleave>
+        <element name="model">
+          <text/>
+        </element>
+        <optional>
+          <element name="topology">
+            <attribute name="sockets">
+              <ref name="positiveInteger"/>
+            </attribute>
+            <attribute name="cores">
+              <ref name="positiveInteger"/>
+            </attribute>
+            <attribute name="threads">
+              <ref name="positiveInteger"/>
+            </attribute>
+          </element>
+        </optional>
+        <zeroOrMore>
+          <element name="feature">
+            <attribute name="policy">
+              <choice>
+                <value>force</value>
+                <value>require</value>
+                <value>optional</value>
+                <value>disable</value>
+                <value>forbid</value>
+              </choice>
+            </attribute>
+            <attribute name="name">
+              <ref name="featureName"/>
+            </attribute>
+            <empty/>
+          </element>
+        </zeroOrMore>
+      </interleave>
+    </element>
+  </define>
   <!--
        Type library
 
@@ -1247,6 +1299,11 @@
       <param name="pattern">[0-9]+</param>
     </data>
   </define>
+  <define name='positiveInteger'>
+    <data type='positiveInteger'>
+      <param name="pattern">[0-9]+</param>
+    </data>
+  </define>
   <define name="countCPU">
     <data type="unsignedShort">
       <param name="pattern">[0-9]+</param>
@@ -1354,4 +1411,9 @@
       <param name="pattern">(0x)?[0-7]</param>
     </data>
   </define>
+  <define name="featureName">
+    <data type="string">
+      <param name='pattern'>[a-zA-Z0-9\-_]+</param>
+    </data>
+  </define>
 </grammar>