diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index e28c0cfe2f..4c5f2e3a0e 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -3563,6 +3563,18 @@
           }
         }
       ]
+    },
+    {
+      "id": "ref",
+      "question": {
+        "en": "What is the reference number?"
+      },
+      "render": {
+        "en": "The reference number is <b>{ref}</b>"
+      },
+      "freeform": {
+        "key": "ref"
+      }
     }
   ],
   "allowMove": false,
diff --git a/assets/layers/windpump/license_info.json b/assets/layers/windpump/license_info.json
new file mode 100644
index 0000000000..038eb72106
--- /dev/null
+++ b/assets/layers/windpump/license_info.json
@@ -0,0 +1,40 @@
+[
+  {
+    "path": "tjasker.jpg",
+    "license": "CC-BY-SA 3.0 Unported",
+    "authors": [
+      "TUFOWKTM"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Tjasker_Sanpoel_04.JPG"
+    ]
+  },
+  {
+    "path": "windpump.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "quincylvania"
+    ],
+    "sources": [
+      "https://github.com/rapideditor/temaki/blob/main/icons/windpump.svg"
+    ]
+  },
+  {
+    "path": "windpump_1.jpg",
+    "license": "CC-BY-SA 4.0",
+    "authors": [
+      "Ben Franske"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Windpump.jpg"
+    ]
+  },
+  {
+    "path": "windpump_2.jpg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "sources": []
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/windpump/tjasker.jpg b/assets/layers/windpump/tjasker.jpg
new file mode 100644
index 0000000000..0f8453d32e
Binary files /dev/null and b/assets/layers/windpump/tjasker.jpg differ
diff --git a/assets/layers/windpump/tjasker.jpg.license b/assets/layers/windpump/tjasker.jpg.license
new file mode 100644
index 0000000000..07cec83508
--- /dev/null
+++ b/assets/layers/windpump/tjasker.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: TUFOWKTM
+SPDX-License-Identifier: CC-BY-SA 3.0 Unported
\ No newline at end of file
diff --git a/assets/layers/windpump/windpump.json b/assets/layers/windpump/windpump.json
new file mode 100644
index 0000000000..21358614d0
--- /dev/null
+++ b/assets/layers/windpump/windpump.json
@@ -0,0 +1,76 @@
+{
+  "id": "windpump",
+  "presets": [
+    {
+      "tags": [
+        "man_made=windpump"
+      ],
+      "title": "a windpump",
+      "description": {
+        "en": "A wind pump is a kind of windmill that is used for pumping natural gas or water."
+      },
+      "exampleImages": [
+        "./assets/layers/windpump/windpump_1.jpg",
+        "./assets/layers/windpump/windpump_2.jpg",
+        "./assets/layers/windpump/tjasker.jpg"
+
+      ]
+    }
+  ],
+  "name": {
+    "en": "Windpumps",
+    "nl": "Pompen op windenergie"
+  },
+  "title": {
+    "mappings": [
+      {
+        "if": "name~*",
+        "then": {
+          "en": "Windpump {ref}"
+        }
+      }
+    ],
+    "render": {
+      "en": "Windpump {ref}"
+    }
+  },
+  "tagRenderings": [
+    "images",
+    {
+      "id": "operator",
+      "question": {
+        "en": "Who operates this windpump?"
+      },
+      "render": {
+        "en": "Operated by {operator}"
+      },
+      "freeform": {
+        "key": "operator"
+      }
+    },
+    "ref",
+    "wikipedia"
+  ],
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "anchor": "bottom",
+      "marker": [
+        {
+          "icon": "circle",
+          "color": "white"
+        },
+        {
+          "icon": "./assets/layers/windpump/windpump.svg"
+        }
+      ]
+    }
+  ],
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": false
+  }
+}
diff --git a/assets/layers/windpump/windpump.svg b/assets/layers/windpump/windpump.svg
new file mode 100644
index 0000000000..6823907afa
--- /dev/null
+++ b/assets/layers/windpump/windpump.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <path d="M9.11 7.5L10.98 14.37C11.06 14.63 10.9 14.91 10.63 14.98C10.39 15.05 10.15 14.93 10.05 14.72L10.02 14.63L9.57 13L8 13L8 15L7 15L7 13L5.43 13L4.98 14.63C4.91 14.9 4.63 15.06 4.37 14.98C4.13 14.92 3.98 14.69 4 14.46L4.02 14.37L5.89 7.5L9.11 7.5ZM7 8L6.79 8L5.7 12L7 12L7 8ZM8.21 8L8 8L8 12L9.3 12L8.21 8ZM8.37 0C8.48 0 8.57 0.09 8.57 0.2C8.57 0.23 8.56 0.25 8.55 0.28L7.65 2.46C7.83 2.48 7.99 2.55 8.13 2.66L9.04 0.48C9.08 0.38 9.2 0.33 9.3 0.37C9.32 0.38 9.34 0.39 9.36 0.41L10.59 1.64C10.66 1.71 10.66 1.84 10.59 1.92C10.57 1.94 10.55 1.95 10.52 1.96L8.34 2.87C8.45 3 8.52 3.17 8.54 3.35L10.72 2.45C10.83 2.41 10.94 2.46 10.98 2.56C10.99 2.58 11 2.61 11 2.63L11 4.37C11 4.48 10.91 4.57 10.8 4.57C10.77 4.57 10.75 4.56 10.72 4.55L8.54 3.65C8.52 3.83 8.45 4 8.34 4.13L10.52 5.04C10.62 5.08 10.67 5.2 10.63 5.3C10.62 5.32 10.6 5.34 10.59 5.36L9.36 6.59C9.28 6.66 9.16 6.66 9.08 6.59C9.06 6.57 9.05 6.55 9.04 6.52L8.13 4.34C7.99 4.45 7.83 4.52 7.65 4.54L8.55 6.72C8.59 6.83 8.54 6.94 8.44 6.98C8.42 6.99 8.39 7 8.37 7L6.64 7C6.52 7 6.44 6.91 6.44 6.8C6.44 6.77 6.44 6.75 6.45 6.72L7.35 4.54C7.17 4.52 7 4.45 6.87 4.34L5.96 6.52C5.92 6.62 5.8 6.67 5.7 6.63C5.68 6.62 5.66 6.61 5.64 6.59L4.41 5.36C4.34 5.28 4.34 5.16 4.41 5.08C4.43 5.06 4.45 5.05 4.48 5.04L6.66 4.13C6.55 3.99 6.48 3.83 6.46 3.65L4.28 4.55C4.17 4.59 4.06 4.54 4.02 4.44C4.01 4.42 4 4.39 4 4.36L4 2.64C4 2.52 4.09 2.44 4.2 2.44C4.23 2.44 4.25 2.44 4.28 2.45L6.46 3.35C6.48 3.17 6.55 3 6.66 2.87L4.48 1.96C4.38 1.92 4.33 1.8 4.37 1.7C4.38 1.68 4.39 1.66 4.41 1.64L5.64 0.41C5.72 0.34 5.84 0.34 5.92 0.41C5.94 0.43 5.95 0.45 5.96 0.48L6.87 2.66C7 2.55 7.17 2.48 7.35 2.46L6.45 0.28C6.41 0.17 6.46 0.06 6.56 0.02C6.58 0.01 6.61 0 6.63 0L8.37 0ZM0 2L3.5 3L3.5 4L0 5L1 3.5L0 2Z"/>
+</svg>
\ No newline at end of file
diff --git a/assets/layers/windpump/windpump.svg.license b/assets/layers/windpump/windpump.svg.license
new file mode 100644
index 0000000000..2fae30bcfd
--- /dev/null
+++ b/assets/layers/windpump/windpump.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: quincylvania
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/windpump/windpump_1.jpg b/assets/layers/windpump/windpump_1.jpg
new file mode 100644
index 0000000000..415db74fd5
Binary files /dev/null and b/assets/layers/windpump/windpump_1.jpg differ
diff --git a/assets/layers/windpump/windpump_1.jpg.license b/assets/layers/windpump/windpump_1.jpg.license
new file mode 100644
index 0000000000..09d8b0a57b
--- /dev/null
+++ b/assets/layers/windpump/windpump_1.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Ben Franske
+SPDX-License-Identifier: CC-BY-SA 4.0
\ No newline at end of file
diff --git a/assets/layers/windpump/windpump_2.jpg b/assets/layers/windpump/windpump_2.jpg
new file mode 100644
index 0000000000..fafdf57b2a
Binary files /dev/null and b/assets/layers/windpump/windpump_2.jpg differ
diff --git a/assets/layers/windpump/windpump_2.jpg.license b/assets/layers/windpump/windpump_2.jpg.license
new file mode 100644
index 0000000000..ed02883002
--- /dev/null
+++ b/assets/layers/windpump/windpump_2.jpg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Pieter Vander Vennet
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/themes/openwindpowermap/openwindpowermap.json b/assets/themes/openwindpowermap/openwindpowermap.json
index f26c055f72..bfdf7530be 100644
--- a/assets/themes/openwindpowermap/openwindpowermap.json
+++ b/assets/themes/openwindpowermap/openwindpowermap.json
@@ -45,6 +45,14 @@
     "Seppe Santens"
   ],
   "layers": [
-    "windturbine"
+    {
+      "builtin": [
+        "windturbine",
+        "windpump"
+      ],
+      "override": {
+        "minzoom": 10
+      }
+    }
   ]
-}
\ No newline at end of file
+}