Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 11010)
+++ trunk/data/defaultpresets.xml	(revision 11025)
@@ -4908,6 +4908,6 @@
             <text key="name" text="Point Name" />
             <text key="operator" text="Operator" />
-            <text key="phone" text="Phone Number" />
-            <label text="(Use international code, like +12-345-67890)" />
+            <text key="emergency_telephone_code" text="Emergency Phone Number" />
+            <label text="(Use number as shown on plate.)" />
             <space />
         </item> <!-- Emergency Access Point -->
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 11010)
+++ trunk/data/validator/deprecated.mapcss	(revision 11025)
@@ -909,2 +909,31 @@
   fixAdd: "vending=animal_feed";
 }
+
+/* #13653 */
+node[highway=emergency_access_point][phone][!emergency_telephone_code],
+way[highway=emergency_access_point][phone][!emergency_telephone_code] {
+  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
+  suggestAlternative: "emergency_telephone_code";
+  fixChangeKey: "phone => emergency_telephone_code";
+  assertMatch:   "node highway=emergency_access_point phone=123";
+  assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=456";
+  assertNoMatch: "node highway=emergency_access_point phone=123 emergency_telephone_code=456";
+  assertNoMatch: "node phone=123";
+}
+node[highway=emergency_access_point][phone=*emergency_telephone_code],
+way[highway=emergency_access_point][phone=*emergency_telephone_code] {
+  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
+  suggestAlternative: "emergency_telephone_code";
+  fixRemove: "phone";
+  assertNoMatch: "node highway=emergency_access_point phone=123";
+  assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=123";
+  assertMatch:   "node highway=emergency_access_point phone=123 emergency_telephone_code=123";
+}
+node[highway=emergency_access_point][phone][emergency_telephone_code][phone!=*emergency_telephone_code],
+way[highway=emergency_access_point][phone][emergency_telephone_code][phone!=*emergency_telephone_code] {
+  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
+  suggestAlternative: "emergency_telephone_code";
+  assertNoMatch: "node highway=emergency_access_point phone=123";
+  assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=123";
+  assertNoMatch: "node highway=emergency_access_point phone=123 emergency_telephone_code=123";
+}