--- Locations.xml.in.orig	2005-01-09 12:14:38.112985064 +0000
+++ Locations.xml.in	2005-01-09 12:13:32.901898656 +0000
@@ -25636,30 +25636,33 @@
     <code>EGYH</code>
     <coordinates>52-52N 000-09E</coordinates>
    </location>
-   <location>
-    <_name>London/City</_name>
-    <code>EGLC</code>
-    <zone>:RBPMS</zone>
-     <coordinates>51-30N 000-30W</coordinates>
-  </location>
-   <location>
-    <_name>London/Gatwick</_name>
-    <code>EGKK</code>
-    <zone>:RBPMS</zone>
-    <coordinates>51-09N 000-11W</coordinates>
-   </location>
-   <location>
-    <_name>London/Heathrow</_name>
-    <code>EGLL</code>
-    <zone>:RBPMS</zone>
-    <coordinates>51-29N 000-27W</coordinates>
-   </location>
-   <location>
-    <_name>London/Stansted</_name>
-    <code>EGSS</code>
-    <zone>:RBPMS</zone>
-    <coordinates>51-53N 000-14E</coordinates>
-   </location>
+   <city>
+     <_name>London</_name>
+     <location>
+       <_name>City</_name>
+       <code>EGLC</code>
+       <zone>:RBPMS</zone>
+       <coordinates>51-30N 000-30W</coordinates>
+     </location>
+     <location>
+        <_name>Gatwick Airport</_name>
+        <code>EGKK</code>
+        <zone>:RBPMS</zone>
+        <coordinates>51-09N 000-11W</coordinates>
+     </location>
+     <location>
+       <_name>Heathrow Airport</_name>
+       <code>EGLL</code>
+       <zone>:RBPMS</zone>
+       <coordinates>51-29N 000-27W</coordinates>
+     </location>
+     <location>
+       <_name>Stansted Airport</_name>
+       <code>EGSS</code>
+       <zone>:RBPMS</zone>
+       <coordinates>51-53N 000-14E</coordinates>
+     </location>
+   </city>
    <location>
      <_name>Luton</_name>
      <code>EGGW</code>-
