diff --git a/data/presets.yaml b/data/presets.yaml
index b7e27a4f8..606d3bc6e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -5860,6 +5860,11 @@ en:
         name: Solar Panel
         # 'terms: photovoltaic module,PV module,sunlight'
         terms: '<translate with synonyms or related terms for ''Solar Panel'', separated by commas>'
+      power/generator/source/hydro:
+        # 'power=generator, generator:source=hydro'
+        name: Water Turbine
+        # 'terms: dam,generator,francis turbine,hydroelectricity,kaplan turbine,pelton turbine'
+        terms: '<translate with synonyms or related terms for ''Water Turbine'', separated by commas>'
       power/generator/source/nuclear:
         # 'power=generator, generator:source=nuclear, generator:method=fission'
         name: Nuclear Reactor
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e3ca4b4dd..b2807c19d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -806,6 +806,7 @@
     "power/cable/underground": {"fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "addTags": {"power": "cable", "location": "underground", "layer": "-1"}, "removeTags": {"power": "cable", "location": "underground", "layer": "-1"}, "name": "Underground Power Cable"},
     "power/generator": {"icon": "temaki-power", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
     "power/generator/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["operator", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["photovoltaic module", "PV module", "sunlight"], "tags": {"power": "generator", "generator:method": "photovoltaic"}, "addTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "removeTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "reference": {"key": "generator:method", "value": "photovoltaic"}, "name": "Solar Panel"},
+    "power/generator/source/hydro": {"icon": "temaki-power", "fields": ["operator", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["height", "manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["dam", "generator", "francis turbine", "hydroelectricity", "kaplan turbine", "pelton turbine"], "tags": {"power": "generator", "generator:source": "hydro"}, "addTags": {"power": "generator", "generator:source": "hydro", "generator:output:electricity": "yes"}, "removeTags": {"power": "generator", "generator:source": "hydro", "generator:output:electricity": "yes"}, "reference": {"key": "generator:source", "value": "hydro"}, "name": "Water Turbine"},
     "power/generator/source/nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "name": "Nuclear Reactor"},
     "power/generator/source/wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/type", "generator/output/electricity", "height", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["generator", "turbine", "windmill", "wind"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "name": "Wind Turbine"},
     "power/line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "line"}, "name": "Power Line"},
diff --git a/data/presets/presets/power/generator/source/hydro.json b/data/presets/presets/power/generator/source/hydro.json
new file mode 100644
index 000000000..0f08ba52e
--- /dev/null
+++ b/data/presets/presets/power/generator/source/hydro.json
@@ -0,0 +1,46 @@
+{
+    "icon": "temaki-power",
+    "fields": [
+        "operator",
+        "generator/method",
+        "generator/type",
+        "generator/output/electricity",
+        "ref"
+    ],
+    "moreFields": [
+        "height",
+        "manufacturer"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "dam",
+        "generator",
+        "francis turbine",
+        "hydroelectricity",
+        "kaplan turbine",
+        "pelton turbine"
+    ],
+    "tags": {
+        "power": "generator",
+        "generator:source": "hydro"
+    },
+    "addTags": {
+        "power": "generator",
+        "generator:source": "hydro",
+        "generator:output:electricity": "yes"
+    },
+    "removeTags": {
+        "power": "generator",
+        "generator:source": "hydro",
+        "generator:output:electricity": "yes"
+    },
+    "reference": {
+        "key": "generator:source",
+        "value": "hydro"
+    },
+    "name": "Water Turbine"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 96d711d35..420c49db7 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -780,6 +780,7 @@
     {"key": "power", "value": "sub_station", "description": "🄿 Substation (unsearchable), 🄳 ➜ power=substation", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"},
     {"key": "power", "value": "generator", "description": "🄿 Power Generator", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"},
     {"key": "generator:method", "value": "photovoltaic", "description": "🄿 Solar Panel", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-solar-panel.svg?sanitize=true"},
+    {"key": "generator:source", "value": "hydro", "description": "🄿 Water Turbine", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"},
     {"key": "generator:method", "value": "fission", "description": "🄿 Nuclear Reactor", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/radiation.svg?sanitize=true"},
     {"key": "generator:method", "value": "wind_turbine", "description": "🄿 Wind Turbine", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wind_turbine.svg?sanitize=true"},
     {"key": "power", "value": "line", "description": "🄿 Power Line", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/power-line.svg?sanitize=true"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index aac71dc08..fd3422a89 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -7286,6 +7286,10 @@
                     "name": "Solar Panel",
                     "terms": "photovoltaic module,PV module,sunlight"
                 },
+                "power/generator/source/hydro": {
+                    "name": "Water Turbine",
+                    "terms": "dam,generator,francis turbine,hydroelectricity,kaplan turbine,pelton turbine"
+                },
                 "power/generator/source/nuclear": {
                     "name": "Nuclear Reactor",
                     "terms": "fission,generator,nuclear,nuke,reactor"