diff --git a/pisi-spec.rng b/pisi-spec.rng
index db4f39ac..ecec16a3 100644
--- a/pisi-spec.rng
+++ b/pisi-spec.rng
@@ -103,7 +103,10 @@
     <!-- Name -->
     <define name="Name">
         <element name="Name">
-            <text/>
+            <data type="string" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+                <param name="pattern">[0-9a-zA-Z-]*</param>
+                <param name="maxLength">255</param>
+            </data>
         </element>
     </define>
 
@@ -124,11 +127,20 @@
     <!-- Packager -->
     <define name="Packager">
         <element name="Packager">
-            <ref name="Name"/>
+            <ref name="Packager.Name"/>
             <ref name="Email"/>
         </element>
     </define>
 
+    <!-- Packager.Name -->
+    <define name="Packager.Name">
+        <element name="Name">
+            <data type="string" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+                <param name="maxLength">255</param>
+            </data>
+        </element>
+    </define>
+
     <!-- Email -->
     <define name="Email">
         <element name="Email">
@@ -426,7 +438,7 @@
             <ref name="Date"/>
             <ref name="Version"/>
             <ref name="Comment"/>
-            <ref name="Name"/>
+            <ref name="Packager.Name"/>
             <ref name="Email"/>
         </element>
     </define>