diff -r 1fb8a14c6702 -r 3ef8b7f4d9d8 components/openscap/files/cpe/openscap-cpe-dict.xml
--- a/components/openscap/files/cpe/openscap-cpe-dict.xml	Fri Aug 28 11:04:52 2015 -0700
+++ b/components/openscap/files/cpe/openscap-cpe-dict.xml	Fri Aug 28 12:37:50 2015 -0700
@@ -4,7 +4,7 @@
 -->
 <cpe-list xmlns="http://cpe.mitre.org/dictionary/2.0"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://cpe.mitre.org/dictionary/2.0 cpe-dictionary_2.0.xsd">
+     xsi:schemaLocation="http://scap.nist.gov/schema/cpe/2.3/ cpe-dictionary_2.3.xsd">
   <cpe-item name="cpe:/o:oracle:solaris">
     <title>Oracle Solaris</title>
     <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5"
@@ -35,4 +35,44 @@
     <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5"
          href="openscap-cpe-oval.xml">oval:com.oracle.solaris.cpe:def:12</check>
   </cpe-item>
+  <cpe-item name="cpe:/o:oracle:solaris:12::global-zone">
+    <title>Oracle Solaris 12 in Global Zone</title>
+    <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5"
+         href="openscap-cpe-oval.xml">oval:com.oracle.solaris.cpe:def:120</check>
+  </cpe-item>
+  <cpe-item name="cpe:/o:oracle:solaris:12::non-global-zone">
+    <title>Oracle Solaris 12 in Non Global Zone</title>
+    <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5"
+         href="openscap-cpe-oval.xml">oval:com.oracle.solaris.cpe:def:121</check>
+  </cpe-item>
+  <cpe-item name="cpe:/o:oracle:solaris:12::kernel-zone">
+    <title>Oracle Solaris 12 in Kernel Zone</title>
+    <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5"
+         href="openscap-cpe-oval.xml">oval:com.oracle.solaris.cpe:def:122</check>
+  </cpe-item>
+  <cpe-item name="cpe:/o:oracle:solaris:12::logical-domain">
+    <title>Oracle Solaris 12 in Logical Domain</title>
+    <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5"
+         href="openscap-cpe-oval.xml">oval:com.oracle.solaris.cpe:def:123</check>
+  </cpe-item>
+  <cpe-item name="cpe:/o:oracle:solaris:12::logical-domain.control">
+    <title>Oracle Solaris 12 in Logical Domain Control Role</title>
+    <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5"
+         href="openscap-cpe-oval.xml">oval:com.oracle.solaris.cpe:def:124</check>
+  </cpe-item>
+  <cpe-item name="cpe:/o:oracle:solaris:12::logical-domain.io">
+    <title>Oracle Solaris 12 in Logical Domain I/O Role</title>
+    <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5"
+         href="openscap-cpe-oval.xml">oval:com.oracle.solaris.cpe:def:125</check>
+  </cpe-item>
+  <cpe-item name="cpe:/o:oracle:solaris:12::logical-domain.root">
+    <title>Oracle Solaris 12 in Logical Domain Root Role</title>
+    <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5"
+         href="openscap-cpe-oval.xml">oval:com.oracle.solaris.cpe:def:126</check>
+  </cpe-item>
+  <cpe-item name="cpe:/o:oracle:solaris:12::logical-domain.service">
+    <title>Oracle Solaris 12 in Logical Domain Service Role</title>
+    <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5"
+         href="openscap-cpe-oval.xml">oval:com.oracle.solaris.cpe:def:127</check>
+  </cpe-item>
 </cpe-list>