diff --git a/data/presets.yaml b/data/presets.yaml
index 21f0c7e3f..1cbb6898a 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3309,6 +3309,16 @@ en:
         # man_made=water_works
         name: Water Works
         terms: '<translate with synonyms or related terms for ''Water Works'', separated by commas>'
+      man_made/watermill:
+        # man_made=watermill
+        name: Watermill
+        # 'terms: water,wheel,mill'
+        terms: '<translate with synonyms or related terms for ''Watermill'', separated by commas>'
+      man_made/windmill:
+        # man_made=windmill
+        name: Windmill
+        # 'terms: wind,wheel,mill'
+        terms: '<translate with synonyms or related terms for ''Windmill'', separated by commas>'
       man_made/works:
         # man_made=works
         name: Factory
diff --git a/data/presets/presets.json b/data/presets/presets.json
index b445ae1a5..2cf2153fa 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -8632,6 +8632,44 @@
             },
             "name": "Water Works"
         },
+        "man_made/watermill": {
+            "icon": "buddhism",
+            "fields": [
+                "building_area"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "water",
+                "wheel",
+                "mill"
+            ],
+            "tags": {
+                "man_made": "watermill"
+            },
+            "name": "Watermill"
+        },
+        "man_made/windmill": {
+            "icon": "buddhism",
+            "fields": [
+                "building_area"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "wind",
+                "wheel",
+                "mill"
+            ],
+            "tags": {
+                "man_made": "windmill"
+            },
+            "name": "Windmill"
+        },
         "man_made/works": {
             "icon": "industry",
             "fields": [
diff --git a/data/presets/presets/man_made/watermill.json b/data/presets/presets/man_made/watermill.json
new file mode 100644
index 000000000..ae909a62f
--- /dev/null
+++ b/data/presets/presets/man_made/watermill.json
@@ -0,0 +1,19 @@
+{
+    "icon": "buddhism",
+    "fields": [
+        "building_area"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "water",
+        "wheel",
+        "mill"
+    ],
+    "tags": {
+        "man_made": "watermill"
+    },
+    "name": "Watermill"
+}
diff --git a/data/presets/presets/man_made/windmill.json b/data/presets/presets/man_made/windmill.json
new file mode 100644
index 000000000..87f8874d8
--- /dev/null
+++ b/data/presets/presets/man_made/windmill.json
@@ -0,0 +1,19 @@
+{
+    "icon": "buddhism",
+    "fields": [
+        "building_area"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "wind",
+        "wheel",
+        "mill"
+    ],
+    "tags": {
+        "man_made": "windmill"
+    },
+    "name": "Windmill"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 14f771382..a9ee28869 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1773,6 +1773,14 @@
             "key": "man_made",
             "value": "water_works"
         },
+        {
+            "key": "man_made",
+            "value": "watermill"
+        },
+        {
+            "key": "man_made",
+            "value": "windmill"
+        },
         {
             "key": "man_made",
             "value": "works"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index b010533d6..c92096ed7 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4003,6 +4003,14 @@
                     "name": "Water Works",
                     "terms": ""
                 },
+                "man_made/watermill": {
+                    "name": "Watermill",
+                    "terms": "water,wheel,mill"
+                },
+                "man_made/windmill": {
+                    "name": "Windmill",
+                    "terms": "wind,wheel,mill"
+                },
                 "man_made/works": {
                     "name": "Factory",
                     "terms": "assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery"