diff --git a/xml/saml-metadata-dri-v1.0-wd01.xsd b/xml/saml-metadata-rpi-v1.0-wd05.xsd
similarity index 52%
rename from xml/saml-metadata-dri-v1.0-wd01.xsd
rename to xml/saml-metadata-rpi-v1.0-wd05.xsd
index 28e27f83..da858032 100644
--- a/xml/saml-metadata-dri-v1.0-wd01.xsd
+++ b/xml/saml-metadata-rpi-v1.0-wd05.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<schema targetNamespace="urn:oasis:names:tc:SAML:metadata:dri"
+<schema targetNamespace="urn:oasis:names:tc:SAML:metadata:rpi"
     xmlns="http://www.w3.org/2001/XMLSchema"
     xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:mddri="urn:oasis:names:tc:SAML:metadata:dri"
+    xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
     elementFormDefault="unqualified" 
     attributeFormDefault="unqualified" 
     blockDefault="substitution" 
@@ -11,10 +11,14 @@
 
     <annotation>
         <documentation>
-            Document title: SAML V2.0 Metadata Extensions for Documentation and Registration Information Version 1.0
-            Document identifier: sstc-saml-metadata-dri-v1.0.xsd
+            Document title: SAML V2.0 Metadata Extensions for Registration and Publication Information Version 1.0
+            Document identifier: sstc-saml-metadata-rpi-v1.0.xsd
             Location: http://docs.oasis-open.org/security/saml/Post2.0/
-            Revision history: 
+            Revision history:
+              21 March 2011
+                Correct minOccurs on elements that were meant to be optional              
+              17 December 2010
+                Change of document title and namespace
               24 November 2010
                 Initial Submission
         </documentation>
@@ -23,45 +27,45 @@
     <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="saml-schema-metadata-2.0.xsd"/>
     <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
     
-    <element name="DocumentInfo" type="mddri:DocumentInfoType" />
-    <complexType name="DocumentInfoType">
+    <element name="RegistrationInfo" type="mdrpi:RegistrationInfoType" />
+    <complexType name="RegistrationInfoType">
+        <sequence>
+            <element ref="mdrpi:RegistrationPolicy" minOccurs="0" maxOccurs="unbounded" />
+            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+        </sequence>
+        <attribute name="registrationAuthority" type="string" use="required"/>
+        <attribute name="registrationInstant" type="dateTime" />
+        <anyAttribute namespace="##other" processContents="lax" />
+    </complexType>
+    
+    <element name="RegistrationPolicy" type="md:localizedURIType" />
+    
+    <element name="PublicationInfo" type="mdrpi:PublicationInfoType" />
+    <complexType name="PublicationInfoType">
         <sequence>
-            <element ref="mddri:UsagePolicy" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="mddri:PublicationPath" minOccurs="0" maxOccurs="1"/>
-            <any namespace="##other" processContents="lax"/>
+            <element ref="mdrpi:UsagePolicy" minOccurs="0" maxOccurs="unbounded"/>
+            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
+        <attribute name="publisher" type="string" use="required" />
         <attribute name="creationInstant" type="dateTime" />
-        <attribute name="serialNumber" type="string" />
+        <attribute name="publicationId" type="string" />
         <anyAttribute namespace="##other" processContents="lax" />
     </complexType>
     
     <element name="UsagePolicy" type="md:localizedURIType" />
     
-    <element name="PublicationPath" type="mddri:PublicationPathType" />
+    <element name="PublicationPath" type="mdrpi:PublicationPathType" />
     <complexType name="PublicationPathType">
         <sequence>
-            <element ref="mddri:Publication" minOccurs="0" maxOccurs="unbounded" />
+            <element ref="mdrpi:Publication" minOccurs="0" maxOccurs="unbounded" />
         </sequence>
     </complexType>
     
-    <element name="Publication" type="mddri:PublicationType" />
+    <element name="Publication" type="mdrpi:PublicationType" />
     <complexType name="PublicationType">
         <attribute name="publisher" type="string" use="required" />
         <attribute name="creationInstant" type="dateTime" />
-        <attribute name="serialNumber" type="string" />
+        <attribute name="publicationId" type="string" />
     </complexType>
     
-    <element name="RegistrationInfo" type="mddri:RegistrationInfoType" />
-    <complexType name="RegistrationInfoType">
-        <sequence>
-            <element ref="mddri:RegistrationPolicy" />
-            <any namespace="##other" processContents="lax"/>
-        </sequence>
-        <attribute name="registrationAuthority" type="anyURI" use="required"/>
-        <attribute name="registrationInstant" type="dateTime" />
-        <anyAttribute namespace="##other" processContents="lax" />
-    </complexType>
-    
-    <element name="RegistrationPolicy" type="md:localizedURIType" />
-    
 </schema>
\ No newline at end of file