diff --git a/layers/aeroway/README.md b/layers/aeroway/README.md
index 7a3c4563..3a6c7a5b 100644
--- a/layers/aeroway/README.md
+++ b/layers/aeroway/README.md
@@ -7,5 +7,4 @@ Read the layer documentation at **http://openmaptiles.org/schema#aeroway**
 ![Mapping diagram for aeroway](http://openmaptiles.org/media/mapping_aeroway.png)
 
 ### ETL diagram
-![ETL diagram for aeroway](http://openmaptiles.org/media/etl_aeroway.png)
-
+![ETL diagram for aeroway](etl_diagram.png?raw=true)
diff --git a/layers/aeroway/etl_diagram.png b/layers/aeroway/etl_diagram.png
new file mode 100644
index 00000000..dcc3cd08
Binary files /dev/null and b/layers/aeroway/etl_diagram.png differ
diff --git a/layers/aeroway/layer.sql b/layers/aeroway/layer.sql
index c8dfe805..ef42b736 100644
--- a/layers/aeroway/layer.sql
+++ b/layers/aeroway/layer.sql
@@ -1,9 +1,16 @@
 -- etldoc: layer_aeroway[shape=record fillcolor=lightpink, style="rounded,filled",
--- etldoc:     label="layer_aeroway |<z12> z12|<z13> z13|<z14_> z14+" ];
+-- etldoc:     label="layer_aeroway |<z11> z11|<z12> z12|<z13> z13|<z14_> z14+" ];
 
 CREATE OR REPLACE FUNCTION layer_aeroway(bbox geometry, zoom_level int)
 RETURNS TABLE(geometry geometry, class text) AS $$
     SELECT geometry, aeroway AS class FROM (
+        -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z11
+        -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z12
+        -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z13
+        -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z14_
+        SELECT geometry, aeroway
+        FROM osm_aeroway_linestring WHERE zoom_level >= 11
+        UNION ALL
         -- etldoc:  osm_aeroway_polygon_gen2 -> layer_aeroway:z12
         SELECT geometry, aeroway
         FROM osm_aeroway_polygon_gen2 WHERE zoom_level = 12
@@ -15,10 +22,6 @@ RETURNS TABLE(geometry geometry, class text) AS $$
         -- etldoc:  osm_aeroway_polygon -> layer_aeroway:z14_
         SELECT geometry, aeroway
         FROM osm_aeroway_polygon WHERE zoom_level >= 14
-        UNION ALL
-        -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z11_
-        SELECT geometry, aeroway
-        FROM osm_aeroway_linestring WHERE zoom_level >= 11
     ) AS zoom_levels
     WHERE geometry && bbox;
 $$ LANGUAGE SQL IMMUTABLE;
diff --git a/layers/aeroway/mapping.yaml b/layers/aeroway/mapping.yaml
index f933b901..718a3500 100644
--- a/layers/aeroway/mapping.yaml
+++ b/layers/aeroway/mapping.yaml
@@ -28,7 +28,9 @@ tables:
       aeroway:
       - aerodrome
       - heliport
+      - runway
       - helipad
+      - taxiway
       - apron
 
   # etldoc: imposm3 -> osm_aeroway_linestring