diff --git a/data/presets.yaml b/data/presets.yaml
index c2f467244..24ed753d6 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -488,7 +488,7 @@ en:
         label: Handrail
       height:
         # height=*
-        label: Height (meters)
+        label: Height (Meters)
       highway:
         # highway=*
         label: Type
@@ -4258,6 +4258,11 @@ en:
         # waterway=water_point
         name: Marine Drinking Water
         terms: '<translate with synonyms or related terms for ''Marine Drinking Water'', separated by commas>'
+      waterway/waterfall:
+        # waterway=waterfall
+        name: Waterfall
+        # 'terms: fall'
+        terms: '<translate with synonyms or related terms for ''Waterfall'', separated by commas>'
       waterway/weir:
         # waterway=weir
         name: Weir
diff --git a/data/presets/fields.json b/data/presets/fields.json
index b14cbb81f..36f39c0be 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -680,7 +680,7 @@
         "height": {
             "key": "height",
             "type": "number",
-            "label": "Height (meters)"
+            "label": "Height (Meters)"
         },
         "highway": {
             "key": "highway",
diff --git a/data/presets/fields/height.json b/data/presets/fields/height.json
index 2640c1982..8a113efe8 100644
--- a/data/presets/fields/height.json
+++ b/data/presets/fields/height.json
@@ -1,5 +1,5 @@
 {
     "key": "height",
     "type": "number",
-    "label": "Height (meters)"
+    "label": "Height (Meters)"
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index ba4310008..c5e3549e7 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -12207,6 +12207,23 @@
             },
             "name": "Marine Drinking Water"
         },
+        "waterway/waterfall": {
+            "icon": "water",
+            "fields": [
+                "height",
+                "width"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "terms": [
+                "fall"
+            ],
+            "tags": {
+                "waterway": "waterfall"
+            },
+            "name": "Waterfall"
+        },
         "waterway/weir": {
             "icon": "dam",
             "geometry": [
diff --git a/data/presets/presets/waterway/waterfall.json b/data/presets/presets/waterway/waterfall.json
new file mode 100644
index 000000000..657c3e85c
--- /dev/null
+++ b/data/presets/presets/waterway/waterfall.json
@@ -0,0 +1,17 @@
+{
+    "icon": "water",
+    "fields": [
+        "height",
+        "width"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "terms": [
+        "fall"
+    ],
+    "tags": {
+        "waterway": "waterfall"
+    },
+    "name": "Waterfall"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 4d3c38595..f99b5ed14 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2736,6 +2736,10 @@
             "key": "waterway",
             "value": "water_point"
         },
+        {
+            "key": "waterway",
+            "value": "waterfall"
+        },
         {
             "key": "waterway",
             "value": "weir"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 59e4cf749..159eb5613 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1066,7 +1066,7 @@
                     "label": "Handrail"
                 },
                 "height": {
-                    "label": "Height (meters)"
+                    "label": "Height (Meters)"
                 },
                 "highway": {
                     "label": "Type"
@@ -4454,6 +4454,10 @@
                     "name": "Marine Drinking Water",
                     "terms": ""
                 },
+                "waterway/waterfall": {
+                    "name": "Waterfall",
+                    "terms": "fall"
+                },
                 "waterway/weir": {
                     "name": "Weir",
                     "terms": ""