diff --git a/data/deprecated.json b/data/deprecated.json
index 7a170c0f0..a62f41e37 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -904,6 +904,22 @@
       "old": {"public_transport": "station", "aerialway": "yes"},
       "replace": {"public_transport": "station", "aerialway": "station"}
     },
+    {
+      "old": {"pump": "hand_pump"},
+      "replace": {"pump": "manual"}
+    },
+    {
+      "old": {"pump": "electrical_pump"},
+      "replace": {"pump": "powered"}
+    },
+    {
+      "old": {"pump": "no_pump"},
+      "replace": {"pump": "no"}
+    },
+    {
+      "old": {"pump": "power"},
+      "replace": {"pump": "powered"}
+    },
     {
       "old": {"railway": "*", "abandoned": "yes"},
       "replace": {"abandoned:railway": "yes"}
diff --git a/data/presets.yaml b/data/presets.yaml
index cc03ee9cf..1afeed873 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1807,6 +1807,15 @@ en:
       pump:
         # pump=*
         label: Pump
+        options:
+          # pump=manual
+          manual: Manual Hand Pump
+          # pump=no
+          'no': None
+          # pump=powered
+          powered: Machine-Powered Pump
+          # pump=yes
+          'yes': 'Yes'
       railway:
         # railway=*
         label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index d06133565..be05b565e 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -312,7 +312,7 @@
     "produce": {"key": "produce", "type": "semiCombo", "label": "Produce"},
     "product": {"key": "product", "type": "semiCombo", "label": "Products"},
     "public_bookcase/type": {"key": "public_bookcase:type", "type": "combo", "label": "Type"},
-    "pump": {"key": "pump", "type": "combo", "label": "Pump"},
+    "pump": {"key": "pump", "type": "combo", "label": "Pump", "strings": {"options": {"yes": "Yes", "manual": "Manual Hand Pump", "powered": "Machine-Powered Pump", "no": "None"}}},
     "railway": {"key": "railway", "type": "typeCombo", "label": "Type"},
     "railway/position": {"key": "railway:position", "type": "text", "placeholder": "Distance to one decimal (123.4)", "label": "Milestone Position"},
     "railway/signal/direction": {"key": "railway:signal:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
diff --git a/data/presets/fields/pump.json b/data/presets/fields/pump.json
index a5c71ce7f..9646056f0 100644
--- a/data/presets/fields/pump.json
+++ b/data/presets/fields/pump.json
@@ -1,5 +1,13 @@
 {
     "key": "pump",
     "type": "combo",
-    "label": "Pump"
+    "label": "Pump",
+    "strings": {
+        "options": {
+            "yes": "Yes",
+            "manual": "Manual Hand Pump",
+            "powered": "Machine-Powered Pump",
+            "no": "None"
+        }
+    }
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index e9ccbbaf3..a28686ddb 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1699,7 +1699,10 @@
     {"key": "produce", "description": "🄵 Produce"},
     {"key": "product", "description": "🄵 Products"},
     {"key": "public_bookcase:type", "description": "🄵 Type"},
-    {"key": "pump", "description": "🄵 Pump"},
+    {"key": "pump", "value": "yes", "description": "🄵 Pump"},
+    {"key": "pump", "value": "manual", "description": "🄵 Pump"},
+    {"key": "pump", "value": "powered", "description": "🄵 Pump"},
+    {"key": "pump", "value": "no", "description": "🄵 Pump"},
     {"key": "railway:position", "description": "🄵 Milestone Position"},
     {"key": "railway:signal:direction", "value": "forward", "description": "🄵 Direction Affected"},
     {"key": "railway:signal:direction", "value": "backward", "description": "🄵 Direction Affected"},
@@ -2131,6 +2134,10 @@
     {"key": "power", "value": "underground_cable", "description": "🄳 ➜ power=cable + location=underground"},
     {"key": "power_source", "description": "🄳 ➜ generator:source=*"},
     {"key": "power_rating", "description": "🄳 ➜ generator:output=*"},
+    {"key": "pump", "value": "hand_pump", "description": "🄳 ➜ pump=manual"},
+    {"key": "pump", "value": "electrical_pump", "description": "🄳 ➜ pump=powered"},
+    {"key": "pump", "value": "no_pump", "description": "🄳 ➜ pump=no"},
+    {"key": "pump", "value": "power", "description": "🄳 ➜ pump=powered"},
     {"key": "recommended_speed", "description": "🄳 ➜ maxspeed:advisory=*"},
     {"key": "recommended_speed:backward", "description": "🄳 ➜ maxspeed:advisory:backward=*"},
     {"key": "recommended_speed:forward", "description": "🄳 ➜ maxspeed:advisory:forward=*"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 90c8fdefb..18eebd9bf 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4093,7 +4093,13 @@
                     "label": "Type"
                 },
                 "pump": {
-                    "label": "Pump"
+                    "label": "Pump",
+                    "options": {
+                        "yes": "Yes",
+                        "manual": "Manual Hand Pump",
+                        "powered": "Machine-Powered Pump",
+                        "no": "None"
+                    }
                 },
                 "railway": {
                     "label": "Type"