diff --git a/layers/transportation/class.sql b/layers/transportation/class.sql
index c5765932..c73ce817 100644
--- a/layers/transportation/class.sql
+++ b/layers/transportation/class.sql
@@ -67,7 +67,7 @@ SELECT CASE
                 'motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'raceway',
                 'motorway_construction', 'trunk_construction', 'primary_construction',
                 'secondary_construction', 'tertiary_construction', 'raceway_construction',
-                'busway'
+                'busway', 'bus_guideway'
                ) THEN TRUE --includes ramps
            ELSE FALSE
        END
diff --git a/layers/transportation/mapping.yaml b/layers/transportation/mapping.yaml
index 17e35175..05a9c0f8 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', '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)
+    sql_filter: (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link', 'busway', 'bus_guideway') OR highway = 'construction' AND construction IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link', 'busway', 'bus_guideway')) AND NOT is_area AND ST_IsValid(geometry)
     tolerance: ZRES12
 
 name_field: &name
@@ -238,6 +238,7 @@ tables:
       - track
       - raceway
       - busway
+      - bus_guideway
       - construction
       public_transport:
       - platform
diff --git a/layers/transportation/mapping_diagram.png b/layers/transportation/mapping_diagram.png
index e790ccd4..c47f739b 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 0808130f..6b710c93 100644
--- a/layers/transportation/transportation.yaml
+++ b/layers/transportation/transportation.yaml
@@ -51,6 +51,8 @@ layer:
           highway: raceway
         busway:
           highway: busway
+        bus_guideway:
+          highway: bus_guideway
         motorway_construction:
           __AND__:
             highway: construction
diff --git a/layers/transportation/update_transportation_merge.sql b/layers/transportation/update_transportation_merge.sql
index b78fd224..68dcc23a 100644
--- a/layers/transportation/update_transportation_merge.sql
+++ b/layers/transportation/update_transportation_merge.sql
@@ -165,8 +165,8 @@ BEGIN
         layer
     FROM osm_transportation_merge_linestring_gen_z11
     WHERE (update_id IS NULL OR id = update_id)
-        AND highway NOT IN ('tertiary', 'tertiary_link', 'busway')
-        AND construction NOT IN ('tertiary', 'tertiary_link', 'busway')
+        AND highway NOT IN ('tertiary', 'tertiary_link', 'busway', 'bus_guideway')
+        AND construction NOT IN ('tertiary', 'tertiary_link', 'busway', 'bus_guideway')
     ;
 
     DELETE FROM osm_transportation_merge_linestring_gen_z9
diff --git a/layers/transportation_name/mapping_diagram.png b/layers/transportation_name/mapping_diagram.png
index e790ccd4..c47f739b 100644
Binary files a/layers/transportation_name/mapping_diagram.png and b/layers/transportation_name/mapping_diagram.png differ