Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 5741)
+++ trunk/data/defaultpresets.xml	(revision 5742)
@@ -1008,6 +1008,9 @@
         </item>
         <item name="Emergency Phone" icon="presets/telephone.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/emergency_phone" />
-            <key key="amenity" value="emergency_phone" />
+            <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/>
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java	(revision 5741)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java	(revision 5742)
@@ -81,4 +81,8 @@
                 testAndRemove("bicycle_parking", "sheffield").
                 add("bicycle_parking", "stands"));
+        // http://wiki.openstreetmap.org/wiki/Tag:emergency=phone
+        checks.add(new DeprecationCheck(2116).
+                testAndRemove("amenity", "emergency_phone").
+                add("emergency", "phone"));
     }
 
Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 5741)
+++ trunk/styles/standard/elemstyles.xml	(revision 5742)
@@ -1791,5 +1791,5 @@
 
 	<rule>
-		<condition k="amenity" v="emergency_phone"/>
+		<condition k="emergency" v="phone"/>
 		<icon annotate="true" src="vehicle/emergency_phone.png"/>
 		<area colour="amenity_light#f7efb7"/>
@@ -3826,4 +3826,5 @@
 	<!-- amenity=park_bench -> amenity=bench -->
 	<!-- amenity=signpost -> information=guidepost -->
+    <!-- amenity=emergency_phone -> emergency=phone -->
 	<!-- highway minor - classification now more detailed -->
 	<!-- highway=stile -> barrier=stile -->