diff --git a/data/presets.yaml b/data/presets.yaml
index 7b483b096..b18f77a8d 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -592,6 +592,9 @@ en:
           underground: Underground
           # 'fire_hydrant:type=wall'
           wall: Wall
+      fireplace:
+        # fireplace=*
+        label: Fireplace
       fitness_station:
         # fitness_station=*
         label: Equipment Type
@@ -2091,6 +2094,10 @@ en:
         name: Gas Station
         # 'terms: petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel'
         terms: '<translate with synonyms or related terms for ''Gas Station'', separated by commas>'
+      amenity/gazebo:
+        # 'amenity=shelter, shelter_type=gazebo'
+        name: Gazebo
+        terms: '<translate with synonyms or related terms for ''Gazebo'', separated by commas>'
       amenity/grave_yard:
         # amenity=grave_yard
         name: Graveyard
@@ -2130,6 +2137,10 @@ en:
         name: Language School
         # 'terms: esl'
         terms: '<translate with synonyms or related terms for ''Language School'', separated by commas>'
+      amenity/lean_to:
+        # 'amenity=shelter, shelter_type=lean_to'
+        name: Lean-To
+        terms: '<translate with synonyms or related terms for ''Lean-To'', separated by commas>'
       amenity/library:
         # amenity=library
         name: Library
diff --git a/data/presets/fields.json b/data/presets/fields.json
index c7a35225f..b92a073f6 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -99,6 +99,7 @@
     "fence_type": {"key": "fence_type", "type": "combo", "label": "Type"},
     "fire_hydrant/position": {"key": "fire_hydrant:position", "type": "combo", "label": "Position", "strings": {"options": {"lane": "Lane", "parking_lot": "Parking Lot", "sidewalk": "Sidewalk", "green": "Green"}}},
     "fire_hydrant/type": {"key": "fire_hydrant:type", "type": "combo", "label": "Type", "strings": {"options": {"pillar": "Pillar/Aboveground", "underground": "Underground", "wall": "Wall", "pond": "Pond"}}},
+    "fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"},
     "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"},
     "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true},
     "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
diff --git a/data/presets/fields/fireplace.json b/data/presets/fields/fireplace.json
new file mode 100644
index 000000000..70254ec55
--- /dev/null
+++ b/data/presets/fields/fireplace.json
@@ -0,0 +1,5 @@
+{
+    "key": "fireplace",
+    "type": "check",
+    "label": "Fireplace"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6b34e9e71..5dc8bd601 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -85,6 +85,7 @@
     "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"},
     "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "name": "Fountain"},
     "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"},
+    "amenity/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"},
     "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "denomination"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
     "amenity/grit_bin": {"fields": ["access_simple"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"},
     "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "address", "emergency"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "removeTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
@@ -93,6 +94,7 @@
     "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
     "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
     "amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours", "language_multi"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
+    "amenity/lean_to": {"icon": "maki-shelter", "fields": ["name", "operator", "building_area", "fireplace"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"},
     "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "building_area", "address", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "ref/isil"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
     "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
     "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
@@ -900,7 +902,7 @@
     "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
     "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage", "address", "phone", "website", "description"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
     "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
-    "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
+    "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fireplace"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
     "tourism/zoo": {"icon": "maki-zoo", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
     "traffic_calming": {"icon": "temaki-diamond", "fields": ["traffic_calming", "direction_vertex"], "geometry": ["vertex", "line"], "tags": {"traffic_calming": "*"}, "terms": ["bump", "hump", "slow", "speed"], "name": "Traffic Calming"},
     "traffic_calming/bump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["hump", "speed", "slow"], "tags": {"traffic_calming": "bump"}, "name": "Speed Bump"},
diff --git a/data/presets/presets/amenity/gazebo.json b/data/presets/presets/amenity/gazebo.json
new file mode 100644
index 000000000..72a57ff9d
--- /dev/null
+++ b/data/presets/presets/amenity/gazebo.json
@@ -0,0 +1,18 @@
+{
+    "icon": "maki-shelter",
+    "fields": [
+        "name",
+        "building_area",
+        "bench",
+        "lit"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "shelter",
+        "shelter_type": "gazebo"
+    },
+    "name": "Gazebo"
+}
diff --git a/data/presets/presets/amenity/lean_to.json b/data/presets/presets/amenity/lean_to.json
new file mode 100644
index 000000000..067f53437
--- /dev/null
+++ b/data/presets/presets/amenity/lean_to.json
@@ -0,0 +1,18 @@
+{
+    "icon": "maki-shelter",
+    "fields": [
+        "name",
+        "operator",
+        "building_area",
+        "fireplace"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "shelter",
+        "shelter_type": "lean_to"
+    },
+    "name": "Lean-To"
+}
diff --git a/data/presets/presets/tourism/wilderness_hut.json b/data/presets/presets/tourism/wilderness_hut.json
index 5a3836143..3b4b6bf82 100644
--- a/data/presets/presets/tourism/wilderness_hut.json
+++ b/data/presets/presets/tourism/wilderness_hut.json
@@ -4,7 +4,8 @@
     "name",
     "operator",
     "address",
-    "building_area"
+    "building_area",
+    "fireplace"
   ],
   "geometry": [
     "point",
diff --git a/data/taginfo.json b/data/taginfo.json
index a850ee93a..e74c82dec 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -568,6 +568,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fuel-15.svg?sanitize=true"
     },
+    {
+      "key": "shelter_type",
+      "value": "gazebo",
+      "description": "Gazebo",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true"
+    },
     {
       "key": "amenity",
       "value": "grave_yard",
@@ -623,6 +630,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/school-15.svg?sanitize=true"
     },
+    {
+      "key": "shelter_type",
+      "value": "lean_to",
+      "description": "Lean-To",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true"
+    },
     {
       "key": "amenity",
       "value": "library",
@@ -6577,6 +6591,7 @@
     {"key": "fire_hydrant:type", "value": "underground", "description": "Type"},
     {"key": "fire_hydrant:type", "value": "wall", "description": "Type"},
     {"key": "fire_hydrant:type", "value": "pond", "description": "Type"},
+    {"key": "fireplace", "description": "Fireplace"},
     {"key": "fitness_station", "description": "Equipment Type"},
     {"key": "fixme", "description": "Fix Me"},
     {"key": "ford", "description": "Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 94c6f0d97..5e22ded82 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1963,6 +1963,9 @@
                         "pond": "Pond"
                     }
                 },
+                "fireplace": {
+                    "label": "Fireplace"
+                },
                 "fitness_station": {
                     "label": "Equipment Type"
                 },
@@ -3273,6 +3276,10 @@
                     "name": "Gas Station",
                     "terms": "petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel"
                 },
+                "amenity/gazebo": {
+                    "name": "Gazebo",
+                    "terms": ""
+                },
                 "amenity/grave_yard": {
                     "name": "Graveyard",
                     "terms": ""
@@ -3305,6 +3312,10 @@
                     "name": "Language School",
                     "terms": "esl"
                 },
+                "amenity/lean_to": {
+                    "name": "Lean-To",
+                    "terms": ""
+                },
                 "amenity/library": {
                     "name": "Library",
                     "terms": "book"