diff --git a/layers/transportation/class.sql b/layers/transportation/class.sql
index bb8b66be..c5765932 100644
--- a/layers/transportation/class.sql
+++ b/layers/transportation/class.sql
@@ -66,7 +66,8 @@ SELECT CASE
                (
                 'motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'raceway',
                 'motorway_construction', 'trunk_construction', 'primary_construction',
-                'secondary_construction', 'tertiary_construction', 'raceway_construction'
+                'secondary_construction', 'tertiary_construction', 'raceway_construction',
+                'busway'
                ) THEN TRUE --includes ramps
            ELSE FALSE
        END
diff --git a/layers/transportation/mapping.yaml b/layers/transportation/mapping.yaml
index 8ab5e855..442a0701 100644
--- a/layers/transportation/mapping.yaml
+++ b/layers/transportation/mapping.yaml
@@ -45,7 +45,7 @@ generalized_tables:
 # etldoc: osm_highway_linestring -> osm_highway_linestring_gen_z11
   highway_linestring_gen_z11:
     source: highway_linestring
-    sql_filter: (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link') OR highway = 'construction' AND construction IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link')) AND NOT is_area AND ST_IsValid(geometry)
+    sql_filter: (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link', 'busway') OR highway = 'construction' AND construction IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link', 'busway')) AND NOT is_area AND ST_IsValid(geometry)
     tolerance: ZRES12
 
 name_field: &name
@@ -227,6 +227,7 @@ tables:
       - service
       - track
       - raceway
+      - busway
       - construction
       public_transport:
       - platform
diff --git a/layers/transportation/mapping_diagram.png b/layers/transportation/mapping_diagram.png
index 62274d8d..acd01b84 100644
Binary files a/layers/transportation/mapping_diagram.png and b/layers/transportation/mapping_diagram.png differ
diff --git a/layers/transportation/transportation.yaml b/layers/transportation/transportation.yaml
index a0d2c8b1..51cb55a4 100644
--- a/layers/transportation/transportation.yaml
+++ b/layers/transportation/transportation.yaml
@@ -45,6 +45,8 @@ layer:
           highway: track
         raceway:
           highway: raceway
+        busway:
+          highway: busway
         motorway_construction:
           __AND__:
             highway: construction
diff --git a/layers/transportation/update_transportation_merge.sql b/layers/transportation/update_transportation_merge.sql
index 639ff277..765e2955 100644
--- a/layers/transportation/update_transportation_merge.sql
+++ b/layers/transportation/update_transportation_merge.sql
@@ -61,8 +61,8 @@ SELECT ST_Simplify(geometry, ZRes(12)) AS geometry,
        toll,
        layer
 FROM osm_transportation_merge_linestring_gen_z11
-WHERE highway NOT IN ('tertiary', 'tertiary_link')
-      AND construction NOT IN ('tertiary', 'tertiary_link')
+WHERE highway NOT IN ('tertiary', 'tertiary_link', 'busway')
+      AND construction NOT IN ('tertiary', 'tertiary_link', 'busway')
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */;
 CREATE INDEX IF NOT EXISTS osm_transportation_merge_linestring_gen_z10_geometry_idx
     ON osm_transportation_merge_linestring_gen_z10 USING gist (geometry);
diff --git a/layers/transportation_name/mapping_diagram.png b/layers/transportation_name/mapping_diagram.png
index 62274d8d..acd01b84 100644
Binary files a/layers/transportation_name/mapping_diagram.png and b/layers/transportation_name/mapping_diagram.png differ