Index: defaultpresets.xml
===================================================================
--- defaultpresets.xml	(revision 3597)
+++ defaultpresets.xml	(working copy)
@@ -2885,10 +2885,20 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
         <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency%3Dfire_hydrant"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency%3Dfire_hydrant"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency%3Dfire_hydrant" />
             <label text="Edit Fire Hydrant" />
-            <key key="amenity" value="fire_hydrant" />
+            <key key="emergency" value="fire_hydrant" />
+            <combo key="fire_hydrant:type" text="Type" values="pillar,pond,underground,wall" default="" delete_if_empty="true" />
+            <optional>
+                <text key="name" text="Name" default="" delete_if_empty="true" />
+                <text key="ref" text="Reference" default="" delete_if_empty="true" />
+                <text key="fire_hydrant:diameter" text="Diameter (mm)" default="" delete_if_empty="true" />
+                <combo key="fire_hydrant:position" text="Position" values="green,lane,parking_lot,sidewalk" default="" delete_if_empty="true" />
+                <combo key="fire_hydrant:pressure" text="Pressure (bar)" values="suction" default="" delete_if_empty="true" />
+                <text key="fire_hydrant:count" text="Count" default="" delete_if_empty="true" />
+            </optional>
         </item>
     </group> <!-- Amenities -->
     <group name="Food" icon="styles/standard/shop/supermarket.png">