diff --git a/schema/unix.xsd b/schema/unix.xsd
index 614958e..940828f 100644
--- a/schema/unix.xsd
+++ b/schema/unix.xsd
@@ -6,7 +6,7 @@
            elementFormDefault="qualified"
            attributeFormDefault="qualified">
 
-    <xs:import namespace="linux" schemaLocation="http://schema.xml.r00t2.io/linux.xsd"/>
+    <xs:import schemaLocation="http://schema.xml.r00t2.io/std.xsd"/>
 
     <xs:simpleType name="t_filepath">
         <xs:restriction base="xs:string">
@@ -14,6 +14,32 @@
         </xs:restriction>
     </xs:simpleType>
 
+    <xs:complexType name="t_nixpass">
+        <xs:choice minOccurs="1" maxOccurs="1">
+            <xs:element name="passwordPlain">
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="xs:string">
+                            <xs:attribute name="hashType" use="optional" default="sha512"
+                                          type="linux:t_passwd_hashtypes"/>
+                            <xs:attribute name="rounds" use="optional" default="5000" type="xs:positiveInteger"/>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="passwordHash">
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="unix:t_shadowhash">
+                            <xs:attribute name="hashType" use="optional" default="md5" type="unix:t_passwd_hashtypes"/>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:choice>
+        <xs:attribute name="locked" use="optional" default="false" type="xs:boolean"/>
+    </xs:complexType>
+
     <xs:simpleType name="t_passwd_hashtypes">
         <xs:restriction base="xs:string">
             <xs:enumeration value="md5"/>
@@ -40,7 +66,7 @@
 
     <xs:complexType name="t_user">
         <xs:sequence>
-            <xs:element name="password" minOccurs="0" maxOccurs="1" type="linux:t_nixpass"/>
+            <xs:element name="password" minOccurs="0" maxOccurs="1" type="unix:t_nixpass"/>
             <xs:element name="xGroup" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:attribute name="name" type="unix:t_posixUserGroup"