diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss
index e5ecac4f97..b284c50099 100644
--- a/data/styles/default/include/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
@@ -496,6 +496,25 @@ node|z15-[natural=beach],
 area|z16-[leisure=beach_resort],
 {text: name; font-size: 10; text-color: @poi_label; text-offset: 1;}
 
+/* Barriers, cliffs */
+
+line[natural=cliff],
+line[barrier=city_wall],
+line[historic=citywalls],
+line[man_made=embankment],
+{text-position: line;}
+
+line|z16-[natural=cliff],
+line|z16-[barrier=city_wall],
+line|z16-[historic=citywalls],
+line|z18-[man_made=embankment],
+{text: name; font-size: 9; text-color: @label_light; text-halo-opacity: 0.8; text-halo-radius: 1; text-halo-color: @label_halo_medium;}
+line|z18-[natural=cliff],
+line|z18-[barrier=city_wall],
+line|z18-[historic=citywalls],
+line|z18-[man_made=embankment],
+{font-size: 10;}
+
 /* 6.WATER */
 
 node|z1-[place=ocean],
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 39c51a10f3..25fcb087d4 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -656,6 +656,10 @@ highway-tertiary-bridge::shield                     # shield::shield z13- (also
 highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
 === 2960
 
+barrier-city_wall
+historic-citywalls
+=== 2957
+
 highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
 highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
 highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
@@ -998,6 +1002,7 @@ amenity-shelter-public_transport                    # icon z17- (also has captio
 emergency-lifeguard                                 # icon z17- (also has caption(optional) z18-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
+natural-cliff
 === 1500
 
 sport-american_football                             # icon z17- (also has caption(optional) z17-)
@@ -1157,6 +1162,7 @@ shop-wholesale                                      # icon z18- (also has captio
 
 amenity-shower                                      # icon z17- (also has caption(optional) z17-)
 amenity-toilets                                     # icon z18- (also has caption(optional) z18-)
+man_made-embankment
 office                                              # icon z18- (also has caption(optional) z18-)
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470
diff --git a/data/styles/outdoors/include/Basemap_label.mapcss b/data/styles/outdoors/include/Basemap_label.mapcss
index d2b4b6edb0..f879434beb 100644
--- a/data/styles/outdoors/include/Basemap_label.mapcss
+++ b/data/styles/outdoors/include/Basemap_label.mapcss
@@ -1,6 +1,12 @@
 /* Keep here changes of the base map style file only. */
 @import("../../default/include/Basemap_label.mapcss");
 
+/* Barriers, cliffs */
+
+line|z14-[natural=cliff],
+{text: name; font-size: 11; text-color: @label_light; text-halo-opacity: 0.8; text-halo-radius: 1; text-halo-color: @label_halo_medium;}
+line|z16-[natural=cliff],
+{font-size: 12; text-color: @label_medium; text-halo-color: @label_halo_light;}
 
 /* 9. ISOLINES */
 
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 6dfc8b70c9..7723c53cd7 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -656,6 +656,10 @@ highway-tertiary-bridge::shield                     # shield::shield z13- (also
 highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
 === 2960
 
+barrier-city_wall
+historic-citywalls
+=== 2957
+
 highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
 highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
 highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
@@ -998,6 +1002,7 @@ amenity-shelter-public_transport                    # icon z14- (also has captio
 emergency-lifeguard                                 # icon z14- (also has caption(optional) z18-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
+natural-cliff
 === 1500
 
 sport-american_football                             # icon z17- (also has caption(optional) z17-)
@@ -1157,6 +1162,7 @@ shop-wholesale                                      # icon z18- (also has captio
 
 amenity-shower                                      # icon z17- (also has caption(optional) z17-)
 amenity-toilets                                     # icon z15- (also has caption(optional) z18-)
+man_made-embankment
 office                                              # icon z18- (also has caption(optional) z18-)
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470