Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6160)
+++ /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">
Index: /trunk/images/presets/aed.svg
===================================================================
--- /trunk/images/presets/aed.svg	(revision 6161)
+++ /trunk/images/presets/aed.svg	(revision 6161)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Creator: CorelDRAW -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:odm="http://product.corel.com/CGS/11/cddns/" xml:space="preserve" width="600px" height="600px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd"
+     viewBox="0 0 600 600">
+ <defs>
+  <style type="text/css">
+   <![CDATA[
+    .fil0 {fill:#FFFFFF}
+    .fil1 {fill:#009A3B}
+   ]]>
+  </style>
+ </defs>
+ <g id="Ebene 1">
+  <rect fill="#FFFFFF" x="0" y="0" width="600" height="600"/>
+  <path fill="#009A3B" d="M0 0l300 0 300 0 0 300 0 300 -300 0 -300 0 0 -600zm259 553c21,-11 49,-30 77,-55 30,-25 53,-49 74,-75 27,-32 46,-65 51,-90 2,-13 2,-36 0,-50 -5,-27 -16,-52 -33,-72 -20,-25 -48,-40 -75,-41 -19,-1 -37,3 -55,12 -15,7 -26,14 -38,26 -4,5 -8,8 -8,8 0,0 -4,-3 -8,-7 -19,-19 -41,-32 -65,-37 -32,-7 -60,0 -86,20 -27,23 -47,60 -52,98 -2,16 -1,35 3,48 9,35 38,79 85,125 38,38 83,73 115,90 4,1 7,3 8,3 0,0 3,-1 7,-3zm253 -393l0 -28 29 -1 30 0 0 -24 0 -24 -29 0c-22,0 -29,-1 -30,-1 0,-1 0,-8 0,-29l0 -29 -27 0 -26 0 0 28c0,25 0,29 -1,30 0,1 -4,1 -30,1l-29 0 0 24 0 24 30 0c26,0 29,0 30,1 0,1 0,8 0,29l0 27 26 0 26 0 1 -28z"/>
+  <path fill="#009A3B" d="M201 479c-1,-1 10,-26 24,-57 13,-31 24,-57 24,-58l1 -1 -35 0c-31,-1 -34,-1 -34,-2 0,0 21,-26 56,-68 31,-37 57,-68 58,-69 2,-2 3,-2 3,-1 0,1 -10,25 -22,54 -12,30 -22,54 -22,54 0,1 6,1 33,1 23,0 32,1 32,1 0,1 -116,145 -117,146 -1,0 -1,0 -1,0z"/>
+ </g>
+</svg>