diff --git a/pisi-spec.dtd b/pisi-spec.dtd
index 11b8dab6..58e32670 100644
--- a/pisi-spec.dtd
+++ b/pisi-spec.dtd
@@ -121,8 +121,7 @@ suck anyway -->
 
 <!ELEMENT Update (#PCDATA | Date | Version | Comment | Name | Email)*>
 <!ATTLIST Update release CDATA #REQUIRED>
-<!-- FIXME: valid types must be used instead of CDATA -->
-<!ATTLIST Update type CDATA #IMPLIED>
+<!ATTLIST Update type (security|bug) #IMPLIED>
 
 <!ELEMENT Date (#PCDATA)>
 <!ELEMENT Version (#PCDATA)>
diff --git a/pisi-spec.rng b/pisi-spec.rng
index 0c24e449..db4f39ac 100644
--- a/pisi-spec.rng
+++ b/pisi-spec.rng
@@ -439,8 +439,6 @@
                 <choice>
                     <value>security</value>
                     <value>bug</value>
-                    <value>normal</value>
-                    <value>enhancement</value>
                 </choice>
             </attribute>
         </optional>