diff --git a/xep-0060.xml b/xep-0060.xml
index d275c35c..0c1e66a7 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -50,6 +50,19 @@
   &stpeter;
   &ralphm;
 
+  <revision>
+    <version>1.15.2</version>
+    <date>2018-05-14</date>
+    <initials>egp</initials>
+    <remark>
+      <p>Fix a few things in the schema:</p>
+      <ul>
+        <li>Remove duplicated &lt;publish/&gt; element.</li>
+        <li>Make &lt;affiliations/&gt;’s node attribute optional.</li>
+        <li>Add a missing optional dataform in &lt;default/&gt;.</li>
+      </ul>
+    </remark>
+  </revision>
   <revision>
     <version>1.15.1</version>
     <date>2018-02-02</date>
@@ -6541,6 +6554,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
 
 <xs:schema
     xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    xmlns:xdata='jabber:x:data'
     targetNamespace='http://jabber.org/protocol/pubsub'
     xmlns='http://jabber.org/protocol/pubsub'
     elementFormDefault='qualified'>
@@ -6575,7 +6589,6 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
           <xs:element ref='affiliations'/>
           <xs:element ref='default'/>
           <xs:element ref='items'/>
-          <xs:element ref='publish'/>
           <xs:element ref='retract'/>
           <xs:element ref='subscription'/>
           <xs:element ref='subscriptions'/>
@@ -6590,7 +6603,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
       <xs:sequence>
         <xs:element ref='affiliation' minOccurs='0' maxOccurs='unbounded'/>
       </xs:sequence>
-      <xs:attribute name='node' type='xs:string' use='required'/>
+      <xs:attribute name='node' type='xs:string' use='optional'/>
     </xs:complexType>
   </xs:element>
 
@@ -6636,21 +6649,20 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
 
   <xs:element name='default'>
     <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base='empty'>
-          <xs:attribute name='node' type='xs:string' use='optional'/>
-          <xs:attribute name='type'
-                        use='optional'
-                        default='leaf'>
-            <xs:simpleType>
-              <xs:restriction base='xs:NCName'>
-                <xs:enumeration value='collection'/>
-                <xs:enumeration value='leaf'/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:attribute>
-        </xs:extension>
-      </xs:simpleContent>
+      <xs:choice minOccurs='0'>
+        <xs:element ref='xdata:x'/>
+      </xs:choice>
+      <xs:attribute name='node' type='xs:string' use='optional'/>
+      <xs:attribute name='type'
+                    use='optional'
+                    default='leaf'>
+        <xs:simpleType>
+          <xs:restriction base='xs:NCName'>
+            <xs:enumeration value='collection'/>
+            <xs:enumeration value='leaf'/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
     </xs:complexType>
   </xs:element>