diff --git a/xep-0080.xml b/xep-0080.xml
index e491ae38..b61cfeed 100644
--- a/xep-0080.xml
+++ b/xep-0080.xml
@@ -27,9 +27,9 @@
   &stpeter;
   <revision>
     <version>1.5pre1</version>
-    <date>2008-01-23</date>
+    <date>2008-01-25</date>
     <initials>jjh/psa</initials>
-    <remark><p>Added velocity element.</p></remark>
+    <remark><p>Added speed element.</p></remark>
   </revision>
   <revision>
     <version>1.4</version>
@@ -234,6 +234,12 @@
       <td>A particular room in a building</td>
       <td>Observatory</td>
     </tr>
+    <tr>
+      <td>speed</td>
+      <td>The speed at which the entity is moving, in meters per second</td>
+      <td>52.69</td>
+      <td>xs:decimal</td>
+    </tr>
     <tr>
       <td>street</td>
       <td>xs:string</td>
@@ -258,12 +264,6 @@
       <td>http://beta.plazes.com/plazes/1940:jabber_inc</td>
       <td>xs:anyURI</td>
     </tr>
-    <tr>
-      <td>velocity</td>
-      <td>The speed at which the entity is moving, in meters per second</td>
-      <td>344</td>
-      <td>xs:decimal</td>
-    </tr>
   </table>
   <p>NOTE: The datatypes specified above are defined in &w3xmlschema2;.</p>
 </section1>
@@ -470,11 +470,11 @@
         <xs:element name='postalcode' minOccurs='0' type='xs:string'/>
         <xs:element name='region' minOccurs='0' type='xs:string'/>
         <xs:element name='room' minOccurs='0' type='xs:string'/>
+        <xs:element name='speed' minOccurs='0' type='xs:decimal'/>
         <xs:element name='street' minOccurs='0' type='xs:string'/>
         <xs:element name='text' minOccurs='0' type='xs:string'/>
         <xs:element name='timestamp' minOccurs='0' type='xs:datetime'/>
         <xs:element name='uri' minOccurs='0' type='xs:anyURI'/>
-        <xs:element name='velocity' minOccurs='0' type='xs:decimal'/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>