diff --git a/data/categories.txt b/data/categories.txt
index 16eb46ea89..0e7bb8f47a 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -6485,6 +6485,58 @@ sw:Malazi
 fa:پناهگاه
 mr:निवारा
 
+amenity-shelter-basic_hut
+en:3Bivouac Hut|Bivvy|Bothy|Hut
+ar:كوخ إقامة مؤقتة
+be:Хаціна-бівак
+bg:Колибка за бивак
+ca:cabana bivac
+cs:bivakovací chata
+da:Bivuakhytte
+de:4Biwakschachtel
+el:καταφύγιο bivouac
+es:cabaña de vivac
+es-MX:cabaña vivac
+et:bivouac-küünla
+eu:bivouac borda
+fa:کلبه بیواک
+fi:bivouac-mökki
+fr:cabane de bivouac
+he:בקתת לינה|בקתה
+hi:द्विवार्षिक झोपड़ी
+hu:bivak kunyhó
+id:pondok bivak
+it:capanna di bivacco
+ja:ビバーク小屋
+ko:비박 오두막
+mr:बिव्होक झोपडी
+nb:bivuakkhytte
+nl:bivakhut
+pl:chata biwakowa
+pt:cabana básica
+ro:baracă de bivuac
+ru:Хижина для ночлега
+sk:bivaková chata
+sv:bivack hydda
+sw:kibanda cha bivouac
+th:กระท่อมพักแรม
+tr:bivouac kulübe
+uk:Хатинка-бівуак
+vi:túp lều bivouac
+zh-Hans:行军床
+zh-Hant:露營小屋
+
+amenity-shelter-lean_to
+en:3Lean-to Shelter|4Shelter|Refuge
+be:Бівальны навес
+bg:Подслон за бивак
+de:Lean-to Wetterschutz
+he:מחסה ללינה|מחסה|מחסה פתוח
+pt:Abrigo tipo telheiro|telheiro
+pt-BR:Abrigo tipo alpendre|alpendre
+ru:Бивачный навес
+uk:Бівуачний навіс
+
 amenity-stripclub
 en:Stripclub
 ar:Stripclub
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 6e00d1ea98..e3c48c34e1 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -537,8 +537,8 @@ natural|water|moat;[natural=water][water=moat];;name;int_name;449;
 natural|water|wastewater;[natural=water][water=wastewater];;name;int_name;450;
 deprecated:railway|razed:06.2023;451;x
 highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_mountain_hiking];;name;int_name;452;
-deprecated|deprecated;453;x
-deprecated|deprecated;454;x
+amenity|shelter|basic_hut;[amenity=shelter][shelter_type=basic_hut];;name;int_name;453;
+amenity|shelter|lean_to;[amenity=shelter][shelter_type=lean_to];;name;int_name;454;
 landuse|orchard;455;
 amenity|shelter|public_transport;[amenity=shelter][shelter_type=public_transport];;name;int_name;456;
 highway|living_street|tunnel;[highway=living_street][tunnel?];;name;int_name;457;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 454e7bcd37..19056c86c4 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -4767,6 +4767,64 @@
     comment = A weather shelter by the public transport stop.
     ref = type.amenity.shelter
 
+  [type.amenity.shelter.basic_hut]
+    comment = Compared to wilderness_hut its smaller and simpler, without a fireplace.
+    en = Bivouac Hut
+    af = bivak hut
+    ar = كوخ إقامة مؤقتة
+    az = bivouac daxması
+    be = Хаціна-бівак
+    bg = Колибка за бивак
+    ca = cabana bivac
+    cs = bivakovací chata
+    da = Bivuakhytte
+    de = Biwakschachtel
+    el = καταφύγιο bivouac
+    es = cabaña de vivac
+    es-MX = cabaña vivac
+    et = bivouac-küünla
+    eu = bivouac borda
+    fa = کلبه بیواک
+    fi = bivouac-mökki
+    fr = cabane de bivouac
+    he = בקתת לינה
+    hi = द्विवार्षिक झोपड़ी
+    hu = bivak kunyhó
+    id = pondok bivak
+    it = capanna di bivacco
+    ja = ビバーク小屋
+    ko = 비박 오두막
+    lt = bivako namelis
+    mr = बिव्होक झोपडी
+    nb = bivuakkhytte
+    nl = bivakhut
+    pl = chata biwakowa
+    pt = cabana básica
+    ro = baracă de bivuac
+    ru = Хижина для ночлега
+    sk = bivaková chata
+    sv = bivack hydda
+    sw = kibanda cha bivouac
+    th = กระท่อมพักแรม
+    tr = bivouac kulübe
+    uk = Хатинка-бівуак
+    vi = túp lều bivouac
+    zh = 露营小屋
+    zh-Hans = 行军床
+    zh-Hant = 露營小屋
+
+  [type.amenity.shelter.lean_to]
+    comment = A traditional 3-walled shelter (one side open), suitable for overnight camping.
+    en = Lean-to Shelter
+    be = Бівальны навес
+    bg = Подслон за бивак
+    de = Lean-to Wetterschutz
+    he = מחסה ללינה
+    pt = Abrigo tipo telheiro
+    pt-BR = Abrigo tipo alpendre
+    ru = Бивачный навес
+    uk = Бівуачний навіс
+
   [type.amenity.public_bath]
     en = Public Bath
     ar = حمام عام
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index d4ca53f38a..d1f39046ed 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -725,6 +725,8 @@ node|z16-[tourism=camp_site],
 node|z16-[tourism=picnic_site],
 node|z18-[leisure=picnic_table],
 node|z17-[amenity=shelter],
+node|z16-[amenity=shelter][shelter_type=basic_hut],
+node|z16-[amenity=shelter][shelter_type=lean_to],
 node|z16-[tourism=caravan_site],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
 
@@ -786,7 +788,10 @@ node|z18-[leisure=outdoor_seating],
 {icon-image: outdoor_seating-m.svg;}
 
 node|z17-[amenity=shelter],
+node|z16-[amenity=shelter][shelter_type=lean_to],
 {icon-image: shelter-m.svg;}
+node|z16-[amenity=shelter][shelter_type=basic_hut],
+{icon-image: alpine_hut-m.svg;}
 
 node|z16-[tourism=caravan_site],
 {icon-image: caravan_site-m.svg; font-size: 11;}
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 1b55120498..914f0d6749 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -401,6 +401,8 @@ amenity-biergarten                                  # icon z15- (also has captio
 amenity-pub                                         # icon z15- (also has caption(optional) z15-)
 === 3950
 
+amenity-shelter-basic_hut                           # icon z16- (also has caption(optional) z16-)
+amenity-shelter-lean_to                             # icon z16- (also has caption(optional) z16-)
 tourism-wilderness_hut                              # icon z16- (also has caption(optional) z16-)
 === 3900
 
@@ -1510,6 +1512,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-pub                                       # caption(optional) z15- (also has icon z15-)
 # === -6050
 
+# amenity-shelter-basic_hut                         # caption(optional) z16- (also has icon z16-)
+# amenity-shelter-lean_to                           # caption(optional) z16- (also has icon z16-)
 # tourism-wilderness_hut                            # caption(optional) z16- (also has icon z16-)
 # === -6100
 
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index 538620c92c..8215d6c527 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -188,6 +188,8 @@ node|z16-[amenity=bbq],
 area|z16-[amenity=bbq],
 node|z13-[amenity=shelter],
 area|z13-[amenity=shelter],
+node|z13-[amenity=shelter][shelter_type=basic_hut],
+node|z13-[amenity=shelter][shelter_type=lean_to],
 node|z13-[tourism=caravan_site],
 area|z13-[tourism=caravan_site],
 {text: name; text-color: @poi_label; text-offset: 1; font-size: 10;}
@@ -249,12 +251,20 @@ area|z16-[amenity=bbq],
 
 node|z13-[amenity=shelter],
 area|z13-[amenity=shelter],
+node|z13-[amenity=shelter][shelter_type=lean_to],
 {icon-image: shelter-s.svg; icon-min-distance: 10; font-size: 11;}
+node|z13-[amenity=shelter][shelter_type=basic_hut],
+{icon-image: alpine_hut-s.svg; icon-min-distance: 10; font-size: 11;}
 node|z14-[amenity=shelter],
 area|z14-[amenity=shelter],
+node|z14-[amenity=shelter][shelter_type=lean_to],
 {icon-image: shelter-m.svg;}
+node|z14-[amenity=shelter][shelter_type=basic_hut],
+{icon-image: alpine_hut-m.svg;}
 node|z16-[amenity=shelter],
 area|z16-[amenity=shelter],
+node|z16-[amenity=shelter][shelter_type=lean_to],
+node|z16-[amenity=shelter][shelter_type=basic_hut],
 {font-size: 12; icon-min-distance: 0;}
 
 node|z13-[tourism=caravan_site],
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index fcac76801b..f5a7d35c81 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -401,6 +401,8 @@ amenity-biergarten                                  # icon z15- (also has captio
 amenity-pub                                         # icon z15- (also has caption(optional) z15-)
 === 3950
 
+amenity-shelter-basic_hut                           # icon z13- (also has caption(optional) z13-)
+amenity-shelter-lean_to                             # icon z13- (also has caption(optional) z13-)
 tourism-wilderness_hut                              # icon z13- (also has caption(optional) z13-)
 === 3900
 
@@ -1510,6 +1512,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-pub                                       # caption(optional) z15- (also has icon z15-)
 # === -6050
 
+# amenity-shelter-basic_hut                         # caption(optional) z13- (also has icon z13-)
+# amenity-shelter-lean_to                           # caption(optional) z13- (also has icon z13-)
 # tourism-wilderness_hut                            # caption(optional) z13- (also has icon z13-)
 # === -6100