diff --git a/xep-0255.xml b/xep-0255.xml
index 30021eaa..e42da6c5 100644
--- a/xep-0255.xml
+++ b/xep-0255.xml
@@ -38,6 +38,17 @@
     <email>ross@buddycloud.com</email>
     <jid>ross@buddycloud.com</jid>
   </author>
+  <revision>
+    <version>0.5</version>
+    <date>2009-03-06</date>
+    <initials>ht</initials>
+    <remark>
+      <ul>
+        <li>Added example with IP address</li>
+        <li>Corrected closing &lt;/iq&gt; tags in examples</li>
+      </ul>
+    </remark>
+  </revision>
   <revision>
     <version>0.4</version>
     <date>2009-02-17</date>
@@ -149,7 +160,7 @@
     <lon>9.9188746</lon>
     <accuracy>35.6</accuracy>
   </locationquery>
-<iq>
+</iq>
   ]]></example>
 
   <example caption='Server responds with location info'><![CDATA[
@@ -169,12 +180,44 @@
     <uri>http://shakespeare.lit/places/kings_head_pub_aalborg</uri>
     <text>Near King's Head Pub</text>
   </geoloc>
-<iq>
+</iq>
+  ]]></example>
+
+  <example caption='Entity queries server with IP address'><![CDATA[
+<iq from='hamlet@shakespeare.lit/phone' 
+    id='q02' 
+    to='location.shakespear.lit' 
+    type='get' 
+    xml:lang='en-US'>
+  <locationquery xmlns='urn:xmpp:locationquery:0'>
+    <reference>
+      <id>80.2.47.198</id>
+      <type>ip</type>
+    </reference>
+  </locationquery>
+</iq>
+  ]]></example>
+
+  <example caption='Server responds with location info'><![CDATA[
+<iq from='location.shakespeare.lit' 
+    id='q02' 
+    to='hamlet@shakespeare.lit/phone' 
+    type='result' 
+    xml:lang='en-US'>
+  <geoloc xmlns='http://jabber.org/protocol/geoloc' xml:lang='en'>
+    <timestamp>1599-10-23T01:56:05Z</timestamp>
+    <lat>56.8</lat>
+    <lon>9.9</lon>
+    <accuracy>100000</accuracy>
+    <locality>Aalborg</locality>
+    <country>Denmark</country>
+  </geoloc>
+</iq>
   ]]></example>
 
   <example caption='Entity queries server with cell tower and wifi access point IDs'><![CDATA[
 <iq from='hamlet@shakespeare.lit/phone' 
-    id='q02' 
+    id='q03' 
     to='location.shakespear.lit' 
     type='get' 
     xml:lang='en-US'>
@@ -192,12 +235,12 @@
       <type>wifi</type>
     </reference>
   </locationquery>
-<iq>
+</iq>
   ]]></example>
 
   <example caption='Server responds with location info'><![CDATA[
 <iq from='location.shakespeare.lit' 
-    id='q02' 
+    id='q03' 
     to='hamlet@shakespeare.lit/phone' 
     type='result' 
     xml:lang='en-US'>
@@ -212,12 +255,12 @@
     <uri>http://shakespeare.lit/places/kings_head_pub_aalborg</uri>
     <text>King's Head Pub</text>
   </geoloc>
-<iq>
+</iq>
   ]]></example>
 
-  <example caption='Entity queries server with reference info from multiple scans and specifies that results should be published'><![CDATA[
+  <example caption='Entity queries server with reference info from multiple cell tower and wifi accespoint scans and specifies that results should be published'><![CDATA[
 <iq from='hamlet@shakespeare.lit/phone' 
-    id='q03' 
+    id='q04' 
     to='location.shakespear.lit' 
     type='get' 
     xml:lang='en-US'>
@@ -262,12 +305,12 @@
       <type>bluetooth</type>
     </reference>
   </locationquery>
-<iq>
+</iq>
   ]]></example>
 
   <example caption='Server responds with empty IQ-result...'><![CDATA[
 <iq from='location.shakespeare.lit' 
-    id='q03' 
+    id='q04' 
     to='hamlet@shakespeare.lit/phone' 
     type='result' 
     xml:lang='en-US' />
@@ -275,7 +318,7 @@
 
   <example caption='...and publishes result to the entity&apos;s geoloc pubsub node...'><![CDATA[
 <iq from='hamlet@shakespeare.lit/phone' 
-    id='q03' 
+    id='q04' 
     to='hamlet@shakespeare.lit/phone' 
     type='set' 
     xml:lang='en-US'>
@@ -298,7 +341,7 @@
       </node>
     </publish>
   </pubsub>
-<iq>
+</iq>
   ]]></example>
 
   <example caption='...which is delivered to everyone subscribing to it'><![CDATA[