diff --git a/xep-0060.xml b/xep-0060.xml
index 72914d79..48e4e039 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -49,10 +49,10 @@
   &ralphm;
 
   <revision>
-    <version>1.11pre2</version>
-    <date>in progress, last updated 2008-02-15</date>
+    <version>1.11pre3</version>
+    <date>in progress, last updated 2008-02-22</date>
     <initials>rm/psa</initials>
-    <remark><p>For collection nodes, changed name of node child element to associate and added disassociate child element to handle disassociation use case; corrected SHIM examples to conform to XEP-0131.</p></remark>
+    <remark><p>For collection nodes, changed name of node child element to associate and added disassociate child element to handle disassociation use case; corrected SHIM examples to conform to XEP-0131; modified lease expiry notification for consistency with other subscription-related notifications (i.e., not using SHIM header); renamed SHIM headers to Collection and SubID for consistency with HTTP and Email headers.</p></remark>
   </revision>
 
   <revision>
@@ -2486,8 +2486,8 @@ And by opposing end them?
     </items>
   </event>
   <headers xmlns='http://jabber.org/protocol/shim'>
-    <header name='pubsub#subid'>123-abc</header>
-    <header name='pubsub#subid'>004-yyy</header>
+    <header name='SubID'>123-abc</header>
+    <header name='SubID'>004-yyy</header>
   </headers>
 </message>
         ]]></example>
@@ -2775,8 +2775,8 @@ And by opposing end them?
     </items>
   </event>
   <headers xmlns='http://jabber.org/protocol/shim'>
-    <header name='pubsub#subid'>123-abc</header>
-    <header name='pubsub#subid'>004-yyy</header>
+    <header name='SubID'>123-abc</header>
+    <header name='SubID'>004-yyy</header>
   </headers>
 </message>
         ]]></example>
@@ -5083,7 +5083,7 @@ And by opposing end them?
     </items>
   </event>
   <headers xmlns='http://jabber.org/protocol/shim'>
-    <header name='pubsub#collection'>blogs</header>
+    <header name='Collection'>blogs</header>
   </headers>
 </message>
 
@@ -5096,7 +5096,7 @@ And by opposing end them?
     </items>
   </event>
   <headers xmlns='http://jabber.org/protocol/shim'>
-    <header name='pubsub#collection'>blogs</header>
+    <header name='Collection'>blogs</header>
   </headers>
 </message>
 .
@@ -5799,13 +5799,17 @@ And by opposing end them?
     to='francisco@denmark.lit/barracks'
     id='lease3'/>
     ]]></example>
-    <p>The service MAY send a message to the subscriber when the lease is almost over (e.g., 24 hours before the end of the lease term). This SHOULD be done by sending a &MESSAGE; containing an empty pubsub &lt;event/&gt; element and a SHIM header named "pubsub#expire".</p>
+    <p>The service MAY send a message to the subscriber when the lease is almost over (e.g., 24 hours before the end of the lease term). This MUST be done by sending a &MESSAGE; containing a &lt;subscription/&gt; element qualified by the 'http://jabber.org/protocol/pubsub#event' namespace and including an 'expiry' attribute.</p>
     <example caption='Service notifies subscriber of impending lease end'><![CDATA[
 <message from='pubsub.shakespeare.lit' to='francisco@denmark.lit/barracks'>
-  <event xmlns='http://jabber.org/protocol/pubsub#event'/>
-  <headers xmlns='http://jabber.org/protocol/shim'>
-    <header name='pubsub#expire'>2006-02-28T23:59Z</header>
-  </headers>
+  <event xmlns='http://jabber.org/protocol/pubsub#event'>
+    <subscription
+        expiry='2006-02-28T23:59Z'
+        jid='francisco@denmark.lit'
+        node='princely_musings'
+        subid='ba49252aaa4f5d320c24d3766f0bdcade78c78d3'
+        subscription='subscribed'/>
+  </event>
 </message>
     ]]></example>
     <p>When the subscriber wants to renew the lease, it would get the current subscription options, change the value of the "pubsub#expire" field, and submit the new subscription options back to the service. If the new expire value exceeds the maximum value allowed for subscription leases, the service MUST change the value of the field to be the current date/time plus the maximum allowed lease period.</p>
@@ -6613,20 +6617,15 @@ O, what a rogue and peasant slave am I!
     </section3>
   </section2>
   <section2 topic='SHIM Headers' anchor='registrar-shim'>
-    <p>The XMPP Registrar includes "pubsub#collection", "pubsub#expire", and "pubsub#subid" in its registry of SHIM headers (see &SHIMHEADERS;). The registry submission is as follows:</p>
+    <p>The XMPP Registrar includes "Collection" and "SubID" in its registry of SHIM headers (see &SHIMHEADERS;). The registry submission is as follows:</p>
     <code><![CDATA[
 <header>
-  <name>pubsub#collection</name>
+  <name>Collection</name>
   <desc>The collection via which a notification was received from the originating node.</desc>
   <doc>XEP-0060</doc>
 </header>
 <header>
-  <name>pubsub#expire</name>
-  <desc>The DateTime at which a pubsub leased subscription will end or has ended.</desc>
-  <doc>XEP-0060</doc>
-</header>
-<header>
-  <name>pubsub#subid</name>
+  <name>SubID</name>
   <desc>A subscription identifer within the pubsub protocol.</desc>
   <doc>XEP-0060</doc>
 </header>
@@ -7142,6 +7141,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=unsubscribe;node=princely_musings
     <xs:complexType>
       <xs:simpleContent>
         <xs:extension base='empty'>
+          <xs:attribute name='expiry' type='xs:dateTime' use='optional'/>
           <xs:attribute name='jid' type='xs:string' use='required'/>
           <xs:attribute name='node' type='xs:string' use='optional'/>
           <xs:attribute name='subid' type='xs:string' use='optional'/>