Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17013)
+++ trunk/resources/data/defaultpresets.xml	(revision 17017)
@@ -7884,4 +7884,13 @@
             <text key="height" text="Height (meters)" length="7" />
         </item> <!-- Cliff -->
+        <item name="Sinkhole" icon="presets/landmark/sinkhole.svg" type="node,closedway" preset_name_label="true">
+            <link wiki="Tag:natural=sinkhole" />
+            <space />
+            <key key="natural" value="sinkhole" />
+            <combo key="sinkhole" text="Type" values="bluehole,doline,estavelle,pit,ponor" />
+            <optional>
+                <reference ref="name_wikipedia_wikidata" />
+            </optional>
+        </item> <!-- Sinkhole -->
         <item name="Cave Entrance" icon="presets/landmark/cave_entrance.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:natural=cave_entrance" />
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 17013)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 17017)
@@ -2047,3 +2047,11 @@
 }
 
+/* #19739 */
+*[natural=sink_hole] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "natural=sinkhole";
+  group: tr("deprecated tagging");
+  fixAdd: "natural=sinkhole";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 17013)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 17017)
@@ -695,4 +695,5 @@
 K:generator:type=solar_photovoltaic_panels
 K:building=part
+K:natural=sink_hole
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)