diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 6dbbfacf74..f62124f241 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -854,10 +854,10 @@ deprecated|deprecated;853;x
 deprecated|deprecated;854;x
 deprecated|deprecated;855;x
 mapswithme|grid;856;
-deprecated|deprecated;857;x
-deprecated|deprecated;858;x
-deprecated|deprecated;859;x
-deprecated|deprecated;860;x
+highway|service|busway;[highway=service][service=busway];;name;int_name;857;
+highway|busway;858;
+highway|busway|bridge;[highway=busway][bridge?];;name;int_name;859;
+highway|busway|tunnel;[highway=busway][tunnel?];;name;int_name;860;
 natural|salt_pond;861;landuse|salt_pond
 deprecated|deprecated;862;x
 deprecated|deprecated;863;x
diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss
index 8fc76007bc..328fbdfd96 100644
--- a/data/styles/clear/include/Roads.mapcss
+++ b/data/styles/clear/include/Roads.mapcss
@@ -172,7 +172,9 @@ line[route=hiking],
 line[highway=footway]
 {z-index: 600;}
 
-line[highway=service]
+line[highway=service],
+line[highway=service][service=busway],
+line[highway=busway],
 {z-index: 650;}
 
 line[highway=pedestrian],
@@ -704,6 +706,8 @@ line|z12-[highway=living_street],
 line|z12-[aeroway=runway],
 line|z14-[aeroway=taxiway],
 line|z15-[highway=service],
+line|z15-[highway=service][service=busway],
+line|z15-[highway=busway],
 {color: @unclassified; opacity: 1;}
 line|z16-[highway=unclassified][tunnel?],
 line|z16-[highway=living_street][tunnel?],
@@ -773,17 +777,27 @@ line|z18-[highway=unclassified][bridge?]::bridgeblack,
 
 /* 7.4 Service 15-22 ZOOM */
 
-line|z15[highway=service]
+line|z15[highway=service],
+line|z15[highway=service][service=busway],
+line|z15[highway=busway],
 {width: 1.2;}
 line|z15-16[highway=service][service=driveway]
 {width: 0;}
-line|z16[highway=service]
+line|z16[highway=service],
+line|z16[highway=service][service=busway],
+line|z16[highway=busway],
 {width: 1.6;}
-line|z17[highway=service]
+line|z17[highway=service],
+line|z17[highway=service][service=busway],
+line|z17[highway=busway],
 {width: 2;}
-line|z18[highway=service]
+line|z18[highway=service],
+line|z18[highway=service][service=busway],
+line|z18[highway=busway],
 {width: 3;}
-line|z19-[highway=service]
+line|z19-[highway=service],
+line|z19-[highway=service][service=busway],
+line|z19-[highway=busway],
 {width: 4;}
 
 /* 8.OTHERS ROADS 13-22 ZOOM */
diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss
index c44282a0db..9126f63085 100644
--- a/data/styles/clear/include/Roads_label.mapcss
+++ b/data/styles/clear/include/Roads_label.mapcss
@@ -67,7 +67,9 @@ line[route=hiking],
 line[highway=footway]
 {z-index: 600;}
 
-line[highway=service]
+line[highway=service],
+line[highway=service][service=busway],
+line[highway=busway],
 {z-index: 650;}
 
 line[highway=pedestrian],
@@ -382,6 +384,8 @@ line|z14-[highway=road],
 line|z14-[highway=living_street],
 line|z14-[highway=pedestrian],
 line|z16-[highway=service],
+line|z16-[highway=service][service=busway],
+line|z16-[highway=busway],
 {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;}
 
 line|z13[highway=unclassified]
@@ -401,12 +405,16 @@ line|z16-17[highway=living_street],
 {font-size: 12;text-halo-color: @label_halo_light;}
 line|z16-17[highway=pedestrian],
 line|z16-17[highway=service],
+line|z16-17[highway=service][service=busway],
+line|z16-17[highway=busway],
 line|z16-17[highway=road],
 {font-size: 10;text-halo-color: @label_halo_light;}
 line|z18-[highway=unclassified],
 line|z18-[highway=living_street],
 line|z18-[highway=pedestrian],
 line|z18-[highway=service],
+line|z18-[highway=service][service=busway],
+line|z18-[highway=busway],
 line|z18-[highway=road],
 {font-size: 12;text-halo-opacity: 1;text-halo-color: @label_halo_light;}