Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 6048)
+++ data/defaultpresets.xml	(working copy)
@@ -1017,14 +1017,6 @@
                 <check key="toilets" text="Toilets" default="off" />
             </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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=traffic_signals"
@@ -4072,6 +4064,26 @@
             <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_32x32.png" 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" />
+            <check key="indoor" text="Located inside a building?" default="off" />
+            <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock"
@@ -4167,7 +4179,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=drinking_water" />
             <label text="Edit Source of Potable Water" />
             <key key="amenity" value="drinking_water" />
-            <combo key="indoor" text="Indoor" values="yes,no" />
+            <check key="indoor" text="Located inside a building?" default="off" />
             <optional>
                 <text key="name" text="Name" />
                 <text key="description" text="Description" />