diff --git a/data/presets.yaml b/data/presets.yaml
index 1b370b2cd..fe6bf5009 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2937,6 +2937,11 @@ en:
       emergency/private:
         # emergency=private
         name: Emergency Access Private
+      emergency/water_tank:
+        # emergency=water_tank
+        name: Emergency Water Tank
+        # 'terms: water tank,cistern,reservoir'
+        terms: '<translate with synonyms or related terms for ''Emergency Water Tank'', separated by commas>'
       emergency/yes:
         # emergency=yes
         name: Emergency Access Yes
diff --git a/data/presets/presets.json b/data/presets/presets.json
index ce5ebd704..b8bc5c70c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6163,6 +6163,27 @@
             },
             "name": "Emergency Phone"
         },
+        "emergency/water_tank": {
+            "icon": "water",
+            "fields": [
+                "name",
+                "operator",
+                "ref"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "terms": [
+                "water tank",
+                "cistern",
+                "reservoir"
+            ],
+            "tags": {
+                "emergency": "water_tank"
+            },
+            "name": "Emergency Water Tank"
+        },
         "entrance": {
             "icon": "entrance-alt1",
             "geometry": [
diff --git a/data/presets/presets/emergency/water_tank.json b/data/presets/presets/emergency/water_tank.json
new file mode 100644
index 000000000..83ce77908
--- /dev/null
+++ b/data/presets/presets/emergency/water_tank.json
@@ -0,0 +1,21 @@
+{
+    "icon": "water",
+    "fields": [
+        "name",
+        "operator",
+        "ref"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "terms": [
+        "water tank",
+        "cistern",
+        "reservoir"
+    ],
+    "tags": {
+        "emergency": "water_tank"
+    },
+    "name": "Emergency Water Tank"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 704e48625..975eaa5d8 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1198,6 +1198,10 @@
             "key": "emergency",
             "value": "phone"
         },
+        {
+            "key": "emergency",
+            "value": "water_tank"
+        },
         {
             "key": "entrance"
         },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 82690ebea..1c309bc68 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3840,6 +3840,10 @@
                     "name": "Emergency Phone",
                     "terms": ""
                 },
+                "emergency/water_tank": {
+                    "name": "Emergency Water Tank",
+                    "terms": "water tank,cistern,reservoir"
+                },
                 "entrance": {
                     "name": "Entrance/Exit",
                     "terms": ""