diff --git a/pisi-spec.dtd b/pisi-spec.dtd
index d1892176..82626d20 100644
--- a/pisi-spec.dtd
+++ b/pisi-spec.dtd
@@ -93,6 +93,7 @@
 <!ELEMENT Provides (COMAR)+>
 <!ELEMENT COMAR (#PCDATA)>
 <!ATTLIST COMAR script CDATA #IMPLIED>
+<!ATTLIST COMAR name CDATA #IMPLIED>
 
 <!ELEMENT Conflicts (Package)+>
 <!-- we have a problem here, this Package tag only contains a package name
@@ -129,10 +130,19 @@ suck anyway -->
 
 <!ELEMENT History (Update+)>
 
-<!ELEMENT Update (#PCDATA | Date | Version | Comment | Name | Email)*>
+<!ELEMENT Update (#PCDATA | Date | Version | Comment | Type | Requires | Name | Email)*>
 <!ATTLIST Update release CDATA #REQUIRED>
 <!ATTLIST Update type (security|bug) #IMPLIED>
 
 <!ELEMENT Date (#PCDATA)>
 <!ELEMENT Version (#PCDATA)>
 <!ELEMENT Comment (#PCDATA)>
+
+<!ELEMENT Type (#PCDATA)>
+<!ATTLIST Type package CDATA #IMPLIED>
+
+<!ELEMENT Requires (Action+)>
+
+<!ELEMENT Action (#PCDATA)>
+<!ATTLIST Action package CDATA #IMPLIED>
+<!ATTLIST Action target CDATA #IMPLIED>
diff --git a/pisi-spec.rng b/pisi-spec.rng
index 0fc029c6..b3244222 100644
--- a/pisi-spec.rng
+++ b/pisi-spec.rng
@@ -1560,6 +1560,9 @@
             <ref name="Date"/>
             <ref name="Version"/>
             <ref name="Comment"/>
+            <zeroOrMore>
+                <ref name="Type"/>
+            </zeroOrMore>
             <optional>
                 <ref name="Requires"/>
             </optional>
@@ -1602,6 +1605,24 @@
         </element>
     </define>
 
+    <!-- Type -->
+    <define name="Type">
+        <element name="Type">
+            <ref name="attlist.Type"/>
+            <choice>
+                <value>security</value>
+                <value>bug</value>
+            </choice>
+        </element>
+    </define>
+
+    <!-- attlist.Type -->
+    <define name="attlist.Type" combine="interleave">
+        <optional>
+            <attribute name="package"/>
+        </optional>
+    </define>
+
     <!-- Requires -->
     <define name="Requires">
         <element name="Requires">
@@ -1614,6 +1635,7 @@
     <!-- Action -->
     <define name="Action">
         <element name="Action">
+            <ref name="attlist.Action"/>
             <choice>
                 <value>reverseDependencyUpdate</value>
                 <value>systemRestart</value>
@@ -1621,4 +1643,14 @@
             </choice>
         </element>
     </define>
+
+    <!-- attlist.Action -->
+    <define name="attlist.Action" combine="interleave">
+        <optional>
+            <attribute name="package"/>
+        </optional>
+        <optional>
+            <attribute name="target"/>
+        </optional>
+    </define>
 </grammar>