diff --git a/data/presets.yaml b/data/presets.yaml
index 33eeedc3b..a346b795c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1604,6 +1604,11 @@ en:
         name: Waste Basket
         # 'terms: bin,rubbish,litter,trash,garbage'
         terms: "<translate with synonyms or related terms for 'Waste Basket', separated by commas>"
+      amenity/waste_disposal:
+        # amenity=waste_disposal
+        name: Garbage Dumpster
+        # 'terms: rubbish,litter,trash'
+        terms: "<translate with synonyms or related terms for 'Garbage Dumpster', separated by commas>"
       amenity/water_point:
         # amenity=water_point
         name: RV Drinking Water
@@ -2586,6 +2591,10 @@ en:
         # man_made=breakwater
         name: Breakwater
         terms: "<translate with synonyms or related terms for 'Breakwater', separated by commas>"
+      man_made/chimney:
+        # man_made=chimney
+        name: Chimney
+        terms: "<translate with synonyms or related terms for 'Chimney', separated by commas>"
       man_made/cutline:
         # man_made=cutline
         name: Cut line
@@ -2598,6 +2607,15 @@ en:
         # man_made=flagpole
         name: Flagpole
         terms: "<translate with synonyms or related terms for 'Flagpole', separated by commas>"
+      man_made/gasometer:
+        # man_made=gasometer
+        name: Gasometer
+        # 'terms: gas holder'
+        terms: "<translate with synonyms or related terms for 'Gasometer', separated by commas>"
+      man_made/groyne:
+        # man_made=groyne
+        name: Groyne
+        terms: "<translate with synonyms or related terms for 'Groyne', separated by commas>"
       man_made/lighthouse:
         # man_made=lighthouse
         name: Lighthouse
@@ -2635,6 +2653,10 @@ en:
         name: Storage Tank
         # 'terms: water,oil,gas,petrol'
         terms: "<translate with synonyms or related terms for 'Storage Tank', separated by commas>"
+      man_made/surveillance:
+        # man_made=surveillance
+        name: Surveillance
+        terms: "<translate with synonyms or related terms for 'Surveillance', separated by commas>"
       man_made/survey_point:
         # man_made=survey_point
         name: Survey Point
@@ -2660,6 +2682,11 @@ en:
         # man_made=water_works
         name: Water Works
         terms: "<translate with synonyms or related terms for 'Water Works', separated by commas>"
+      man_made/works:
+        # man_made=works
+        name: Works
+        # 'terms: car assembly plant,aluminium processing plant,brewery,furniture manufacture factory,oil refinery,platic recycling'
+        terms: "<translate with synonyms or related terms for 'Works', separated by commas>"
       military/airfield:
         # military=airfield
         name: Airfield
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 57a905b84..961a611e2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2197,6 +2197,22 @@
         ],
         "name": "Waste Basket"
     },
+    "amenity/waste_disposal": {
+        "icon": "waste-basket",
+        "geometry": [
+            "point",
+            "vertex"
+        ],
+        "tags": {
+            "amenity": "waste_disposal"
+        },
+        "terms": [
+            "rubbish",
+            "litter",
+            "trash"
+        ],
+        "name": "Garbage Dumpster"
+    },
     "amenity/water_point": {
         "icon": "water",
         "geometry": [
@@ -5905,6 +5921,16 @@
         },
         "name": "Breakwater"
     },
+    "man_made/chimney": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "man_made": "chimney"
+        },
+        "name": "Chimney"
+    },
     "man_made/cutline": {
         "geometry": [
             "line"
@@ -5934,6 +5960,29 @@
         "name": "Flagpole",
         "icon": "embassy"
     },
+    "man_made/gasometer": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "gas holder"
+        ],
+        "tags": {
+            "man_made": "gasometer"
+        },
+        "name": "Gasometer"
+    },
+    "man_made/groyne": {
+        "geometry": [
+            "line",
+            "area"
+        ],
+        "tags": {
+            "man_made": "groyne"
+        },
+        "name": "Groyne"
+    },
     "man_made/lighthouse": {
         "icon": "lighthouse",
         "fields": [
@@ -6066,6 +6115,16 @@
         },
         "name": "Storage Tank"
     },
+    "man_made/surveillance": {
+        "icon": "camera",
+        "geometry": [
+            "point"
+        ],
+        "tags": {
+            "man_made": "surveillance"
+        },
+        "name": "Surveillance"
+    },
     "man_made/survey_point": {
         "icon": "monument",
         "fields": [
@@ -6155,6 +6214,24 @@
         },
         "name": "Water Works"
     },
+    "man_made/works": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "car assembly plant",
+            "aluminium processing plant",
+            "brewery",
+            "furniture manufacture factory",
+            "oil refinery",
+            "platic recycling"
+        ],
+        "tags": {
+            "man_made": "works"
+        },
+        "name": "Works"
+    },
     "military/airfield": {
         "icon": "airfield",
         "geometry": [
diff --git a/data/taginfo.json b/data/taginfo.json
index d2931d9d3..ead5a1b7e 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -456,6 +456,10 @@
             "key": "amenity",
             "value": "waste_basket"
         },
+        {
+            "key": "amenity",
+            "value": "waste_disposal"
+        },
         {
             "key": "amenity",
             "value": "water_point"
@@ -1358,6 +1362,10 @@
             "key": "man_made",
             "value": "breakwater"
         },
+        {
+            "key": "man_made",
+            "value": "chimney"
+        },
         {
             "key": "man_made",
             "value": "cutline"
@@ -1370,6 +1378,14 @@
             "key": "man_made",
             "value": "flagpole"
         },
+        {
+            "key": "man_made",
+            "value": "gasometer"
+        },
+        {
+            "key": "man_made",
+            "value": "groyne"
+        },
         {
             "key": "man_made",
             "value": "lighthouse"
@@ -1402,6 +1418,10 @@
             "key": "man_made",
             "value": "storage_tank"
         },
+        {
+            "key": "man_made",
+            "value": "surveillance"
+        },
         {
             "key": "man_made",
             "value": "survey_point"
@@ -1426,6 +1446,10 @@
             "key": "man_made",
             "value": "water_works"
         },
+        {
+            "key": "man_made",
+            "value": "works"
+        },
         {
             "key": "military",
             "value": "airfield"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9d2598940..746692780 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1968,6 +1968,10 @@
                 "name": "Waste Basket",
                 "terms": "bin,rubbish,litter,trash,garbage"
             },
+            "amenity/waste_disposal": {
+                "name": "Garbage Dumpster",
+                "terms": "rubbish,litter,trash"
+            },
             "amenity/water_point": {
                 "name": "RV Drinking Water",
                 "terms": ""
@@ -2884,6 +2888,10 @@
                 "name": "Breakwater",
                 "terms": ""
             },
+            "man_made/chimney": {
+                "name": "Chimney",
+                "terms": ""
+            },
             "man_made/cutline": {
                 "name": "Cut line",
                 "terms": ""
@@ -2896,6 +2904,14 @@
                 "name": "Flagpole",
                 "terms": ""
             },
+            "man_made/gasometer": {
+                "name": "Gasometer",
+                "terms": "gas holder"
+            },
+            "man_made/groyne": {
+                "name": "Groyne",
+                "terms": ""
+            },
             "man_made/lighthouse": {
                 "name": "Lighthouse",
                 "terms": ""
@@ -2928,6 +2944,10 @@
                 "name": "Storage Tank",
                 "terms": "water,oil,gas,petrol"
             },
+            "man_made/surveillance": {
+                "name": "Surveillance",
+                "terms": ""
+            },
             "man_made/survey_point": {
                 "name": "Survey Point",
                 "terms": ""
@@ -2952,6 +2972,10 @@
                 "name": "Water Works",
                 "terms": ""
             },
+            "man_made/works": {
+                "name": "Works",
+                "terms": "car assembly plant,aluminium processing plant,brewery,furniture manufacture factory,oil refinery,platic recycling"
+            },
             "military/airfield": {
                 "name": "Airfield",
                 "terms": ""