Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6159)
+++ trunk/data/defaultpresets.xml	(revision 6161)
@@ -1048,11 +1048,4 @@
             </optional>
         </item>
-        <item name="Emergency Phone" icon="presets/telephone.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone" 
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=phone"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=phone" />
-            <key key="emergency" value="phone" />
-        </item>
         <separator/>
         <item name="Traffic Signal" icon="presets/traffic-light.png" type="node">
@@ -4072,5 +4065,5 @@
             <key key="amenity" value="toilets" />
             <combo key="access"           values="public,permissive,customers" text="Access rights" />
-            <combo key="drinking_water"   values="yes,no" text="Drinking Water" />
+            <combo key="drinking_water"   values="yes,no,seasonal" text="Drinking Water" />
             <combo key="toilets:disposal" values="flush,pitlatrine,chemical,bucket" text="Type" />
             <optional>
@@ -4108,4 +4101,27 @@
             <check key="payment:credit_cards" text="Credit cards" default="off" />
             <check key="payment:telephone_cards" text="Telephone cards" default="off" />
+        </item>
+        <item name="Emergency Phone" icon="presets/telephone.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone" 
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=phone"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=phone" />
+            <key key="emergency" value="phone" />
+        </item>
+        <item name="Automated Defibrillator" icon="presets/aed.svg" type="node">
+            <link    href="http://wiki.openstreetmap.org/wiki/Tag:emergency=aed" 
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=aed"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=aed" />
+            <label text="Edit Automated External Defibrillator" />
+            <key   key="emergency" value="aed" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,limited" />
+            <text  key="operator" text="Operator" /> 
+            <check key="indoor" text="Located inside a building?" default="off" />
+            <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
+            <optional>
+                <text key="lastcheck"      text="Last check date (YYYY-MM-DD)" />
+                <text key="lastcheck:note" text="Last check note" />
+            </optional>
+            -->
         </item>
         <item name="Clock" icon="styles/standard/service/clock.png" type="node">