diff --git a/layers/aeroway/README.md b/layers/aeroway/README.md
index 7a3c456..3a6c7a5 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 0000000..dcc3cd0
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 8814f5c..ef42b73 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
diff --git a/layers/aeroway/mapping.yaml b/layers/aeroway/mapping.yaml
index 2f1b90e..718a350 100644
--- a/layers/aeroway/mapping.yaml
+++ b/layers/aeroway/mapping.yaml
@@ -32,3 +32,19 @@ tables:
       - helipad
       - taxiway
       - apron
+
+  # etldoc: imposm3 -> osm_aeroway_linestring
+  aeroway_linestring:
+    type: linestring
+    fields:
+    - name: osm_id
+      type: id
+    - name: geometry
+      type: geometry
+    - name: aeroway
+      key: aeroway
+      type: string
+    mapping:
+      aeroway:
+      - runway
+      - taxiway