diff --git a/data/deprecated.json b/data/deprecated.json
index bfad91e0a..313a11c06 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -633,6 +633,38 @@
     "old": {"kerb": "flat"},
     "replace": {"kerb": "flush"}
   },
+  {
+    "old": {"lamp_mount": "bent mast"},
+    "replace": {"lamp_mount": "bent_mast"}
+  },
+  {
+    "old": {"lamp_mount": "straight mast"},
+    "replace": {"lamp_mount": "straight_mast"}
+  },
+  {
+    "old": {"lamp_mount": "straightmast"},
+    "replace": {"lamp_mount": "straight_mast"}
+  },
+  {
+    "old": {"lamp_mount": "streight_mast"},
+    "replace": {"lamp_mount": "straight_mast"}
+  },
+  {
+    "old": {"lamp_mount": "wal"},
+    "replace": {"lamp_mount": "wall"}
+  },
+  {
+    "old": {"lamp_mount": "wall mounted"},
+    "replace": {"lamp_mount": "wall"}
+  },
+  {
+    "old": {"lamp_mount": "wall_mount"},
+    "replace": {"lamp_mount": "wall"}
+  },
+  {
+    "old": {"lamp_mount": "wall_mounted"},
+    "replace": {"lamp_mount": "wall"}
+  },
   {
     "old": {"landcover": "flower_bed"},
     "replace": {"landuse": "flowerbed"}
diff --git a/data/presets.yaml b/data/presets.yaml
index 142ef080d..a41f7f0ca 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1235,6 +1235,9 @@ en:
       label:
         # label=*
         label: Label
+      lamp_mount:
+        # lamp_mount=*
+        label: Mount
       lamp_type:
         # lamp_type=*
         label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index d9466ca0d..370ab2be2 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -231,6 +231,7 @@
   "kerb/height": {"key": "kerb:height", "type": "combo", "snake_case": false, "label": "Height"},
   "kneipp_water_cure_multi": {"key": "kneipp_water_cure:", "type": "multiCombo", "label": "Basin Types"},
   "label": {"key": "label", "type": "textarea", "label": "Label"},
+  "lamp_mount": {"key": "lamp_mount", "type": "combo", "label": "Mount"},
   "lamp_type": {"key": "lamp_type", "type": "combo", "label": "Type"},
   "landuse": {"key": "landuse", "type": "typeCombo", "label": "Type"},
   "lanes": {"key": "lanes", "type": "number", "minValue": 0, "label": "Lanes", "placeholder": "1, 2, 3..."},
diff --git a/data/presets/fields/lamp_mount.json b/data/presets/fields/lamp_mount.json
new file mode 100644
index 000000000..8c904f614
--- /dev/null
+++ b/data/presets/fields/lamp_mount.json
@@ -0,0 +1,5 @@
+{
+    "key": "lamp_mount",
+    "type": "combo",
+    "label": "Mount"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 06f9bafb9..7b9a5c2fb 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -563,7 +563,7 @@
   "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "access_simple", "handrail", "step_count", "tactile_paving", "surface", "width"], "moreFields": ["covered", "dog", "indoor", "level_semi", "lit", "name", "ref", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"},
   "highway/steps/conveying": {"icon": "maki-entrance", "fields": ["incline_steps", "conveying", "access_simple", "indoor", "level_semi", "width"], "moreFields": ["{highway/steps}", "handrail", "step_count", "surface"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"},
   "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"},
-  "highway/street_lamp": {"icon": "temaki-street_lamp_arm", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"},
+  "highway/street_lamp": {"icon": "temaki-street_lamp_arm", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "lamp_mount", "direction", "height", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"},
   "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"},
   "highway/tertiary": {"icon": "iD-highway-tertiary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "geometry": ["line"], "tags": {"highway": "tertiary"}, "terms": ["road", "street"], "name": "Tertiary Road"},
   "highway/track": {"icon": "fas-truck-monster", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["covered", "flood_prone", "horse_scale", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"},
diff --git a/data/presets/presets/highway/street_lamp.json b/data/presets/presets/highway/street_lamp.json
index 1dcff6d2f..e16bc453a 100644
--- a/data/presets/presets/highway/street_lamp.json
+++ b/data/presets/presets/highway/street_lamp.json
@@ -9,7 +9,9 @@
     },
     "fields": [
         "lamp_type",
+        "lamp_mount",
         "direction",
+        "height",
         "ref"
     ],
     "terms": [
diff --git a/data/taginfo.json b/data/taginfo.json
index a87a37b0b..acbfdd41b 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1596,6 +1596,7 @@
     {"key": "kerb:height", "description": "🄵 Height"},
     {"key": "kneipp_water_cure:", "description": "🄵 Basin Types"},
     {"key": "label", "description": "🄵 Label"},
+    {"key": "lamp_mount", "description": "🄵 Mount"},
     {"key": "lamp_type", "description": "🄵 Type"},
     {"key": "lanes", "description": "🄵 Lanes"},
     {"key": "language:", "description": "🄵 Languages"},
@@ -2128,6 +2129,14 @@
     {"key": "internet_access:type", "description": "🄳 ➜ internet_access=*"},
     {"key": "kerb", "value": "dropped", "description": "🄳 ➜ kerb=lowered"},
     {"key": "kerb", "value": "flat", "description": "🄳 ➜ kerb=flush"},
+    {"key": "lamp_mount", "value": "bent mast", "description": "🄳 ➜ lamp_mount=bent_mast"},
+    {"key": "lamp_mount", "value": "straight mast", "description": "🄳 ➜ lamp_mount=straight_mast"},
+    {"key": "lamp_mount", "value": "straightmast", "description": "🄳 ➜ lamp_mount=straight_mast"},
+    {"key": "lamp_mount", "value": "streight_mast", "description": "🄳 ➜ lamp_mount=straight_mast"},
+    {"key": "lamp_mount", "value": "wal", "description": "🄳 ➜ lamp_mount=wall"},
+    {"key": "lamp_mount", "value": "wall mounted", "description": "🄳 ➜ lamp_mount=wall"},
+    {"key": "lamp_mount", "value": "wall_mount", "description": "🄳 ➜ lamp_mount=wall"},
+    {"key": "lamp_mount", "value": "wall_mounted", "description": "🄳 ➜ lamp_mount=wall"},
     {"key": "landcover", "value": "flower_bed", "description": "🄳 ➜ landuse=flowerbed"},
     {"key": "landcover", "value": "flowerbed", "description": "🄳 ➜ landuse=flowerbed"},
     {"key": "landuse", "value": "conservation", "description": "🄳 ➜ boundary=protected_area"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 428adb624..2cd1067bc 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3700,6 +3700,9 @@
                 "label": {
                     "label": "Label"
                 },
+                "lamp_mount": {
+                    "label": "Mount"
+                },
                 "lamp_type": {
                     "label": "Type"
                 },