diff --git a/data/presets.yaml b/data/presets.yaml
index a2def8a1d..b80e56336 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -614,6 +614,9 @@ en:
       kerb:
         # kerb=*
         label: Curb
+      label:
+        # label=*
+        label: Label
       lamp_type:
         # lamp_type=*
         label: Type
@@ -699,6 +702,9 @@ en:
       man_made:
         # man_made=*
         label: Type
+      manhole:
+        # manhole=*
+        label: Type
       map_size:
         # map_size=*
         label: Coverage
@@ -3308,6 +3314,16 @@ en:
         name: Factory
         # 'terms: assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery'
         terms: '<translate with synonyms or related terms for ''Factory'', separated by commas>'
+      manhole:
+        # manhole=*
+        name: Manhole
+        # 'terms: cover,hole,sewer,sewage,telecom'
+        terms: '<translate with synonyms or related terms for ''Manhole'', separated by commas>'
+      manhole/drain:
+        # manhole=drain
+        name: Storm Drain
+        # 'terms: cover,drain,hole,rain,sewer,sewage,storm'
+        terms: '<translate with synonyms or related terms for ''Storm Drain'', separated by commas>'
       natural:
         # natural=*
         name: Natural
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 453eff4d8..c2c669ba8 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -855,6 +855,11 @@
             "type": "combo",
             "label": "Curb"
         },
+        "label": {
+            "key": "label",
+            "type": "textarea",
+            "label": "Label"
+        },
         "lamp_type": {
             "key": "lamp_type",
             "type": "combo",
@@ -965,6 +970,11 @@
             "type": "typeCombo",
             "label": "Type"
         },
+        "manhole": {
+            "key": "manhole",
+            "type": "typeCombo",
+            "label": "Type"
+        },
         "map_size": {
             "key": "map_size",
             "type": "typeCombo",
diff --git a/data/presets/fields/label.json b/data/presets/fields/label.json
new file mode 100644
index 000000000..58292ec3a
--- /dev/null
+++ b/data/presets/fields/label.json
@@ -0,0 +1,5 @@
+{
+    "key": "label",
+    "type": "textarea",
+    "label": "Label"
+}
diff --git a/data/presets/fields/manhole.json b/data/presets/fields/manhole.json
new file mode 100644
index 000000000..ebedb95aa
--- /dev/null
+++ b/data/presets/fields/manhole.json
@@ -0,0 +1,5 @@
+{
+    "key": "manhole",
+    "type": "typeCombo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 557ced3f5..eb953201b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -8660,6 +8660,54 @@
             },
             "name": "Factory"
         },
+        "manhole": {
+            "icon": "circle-stroked",
+            "fields": [
+                "manhole",
+                "operator",
+                "label",
+                "ref"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "manhole": "*"
+            },
+            "terms": [
+                "cover",
+                "hole",
+                "sewer",
+                "sewage",
+                "telecom"
+            ],
+            "name": "Manhole"
+        },
+        "manhole/drain": {
+            "icon": "water",
+            "fields": [
+                "operator",
+                "ref"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "manhole": "drain"
+            },
+            "terms": [
+                "cover",
+                "drain",
+                "hole",
+                "rain",
+                "sewer",
+                "sewage",
+                "storm"
+            ],
+            "name": "Storm Drain"
+        },
         "natural": {
             "icon": "natural",
             "fields": [
diff --git a/data/presets/presets/manhole.json b/data/presets/presets/manhole.json
new file mode 100644
index 000000000..c677f5287
--- /dev/null
+++ b/data/presets/presets/manhole.json
@@ -0,0 +1,24 @@
+{
+    "icon": "circle-stroked",
+    "fields": [
+        "manhole",
+        "operator",
+        "label",
+        "ref"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "manhole": "*"
+    },
+    "terms": [
+        "cover",
+        "hole",
+        "sewer",
+        "sewage",
+        "telecom"
+    ],
+    "name": "Manhole"
+}
diff --git a/data/presets/presets/manhole/drain.json b/data/presets/presets/manhole/drain.json
new file mode 100644
index 000000000..0f181a1b8
--- /dev/null
+++ b/data/presets/presets/manhole/drain.json
@@ -0,0 +1,24 @@
+{
+    "icon": "water",
+    "fields": [
+        "operator",
+        "ref"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "manhole": "drain"
+    },
+    "terms": [
+        "cover",
+        "drain",
+        "hole",
+        "rain",
+        "sewer",
+        "sewage",
+        "storm"
+    ],
+    "name": "Storm Drain"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 07858e649..14f771382 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1777,6 +1777,13 @@
             "key": "man_made",
             "value": "works"
         },
+        {
+            "key": "manhole"
+        },
+        {
+            "key": "manhole",
+            "value": "drain"
+        },
         {
             "key": "natural"
         },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index fbd04f00b..202b7ed46 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1568,6 +1568,9 @@
                 "kerb": {
                     "label": "Curb"
                 },
+                "label": {
+                    "label": "Label"
+                },
                 "lamp_type": {
                     "label": "Type"
                 },
@@ -1639,6 +1642,9 @@
                 "man_made": {
                     "label": "Type"
                 },
+                "manhole": {
+                    "label": "Type"
+                },
                 "map_size": {
                     "label": "Coverage"
                 },
@@ -3962,6 +3968,14 @@
                     "name": "Factory",
                     "terms": "assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery"
                 },
+                "manhole": {
+                    "name": "Manhole",
+                    "terms": "cover,hole,sewer,sewage,telecom"
+                },
+                "manhole/drain": {
+                    "name": "Storm Drain",
+                    "terms": "cover,drain,hole,rain,sewer,sewage,storm"
+                },
                 "natural": {
                     "name": "Natural",
                     "terms": ""