diff --git a/layers/aeroway/aeroway.yaml b/layers/aeroway/aeroway.yaml
index e2f0b36..6ba7ab3 100644
--- a/layers/aeroway/aeroway.yaml
+++ b/layers/aeroway/aeroway.yaml
@@ -9,7 +9,9 @@ layer:
     ref: The OSM [`ref`](http://wiki.openstreetmap.org/wiki/Key:ref) tag of the runway/taxiway.
     class:
       description: |
-          The original value of the [`aeroway`](http://wiki.openstreetmap.org/wiki/Key:aeroway) tag.
+          The original value of
+          [`aeroway`](http://wiki.openstreetmap.org/wiki/Key:aeroway) or
+          `area:aeroway` tag.
       values:
       - aerodrome
       - heliport
diff --git a/layers/aeroway/mapping.yaml b/layers/aeroway/mapping.yaml
index 724b1eb..9a9b6c7 100644
--- a/layers/aeroway/mapping.yaml
+++ b/layers/aeroway/mapping.yaml
@@ -22,6 +22,14 @@ ref_field: &ref
   name: ref
   type: string
 
+def_aeroway_polygon_mapping: &aeroway_polygon_mapping
+  - aerodrome
+  - heliport
+  - runway
+  - helipad
+  - taxiway
+  - apron
+
 tables:
   # etldoc: imposm3 -> osm_aeroway_polygon
   aeroway_polygon:
@@ -33,20 +41,14 @@ tables:
     - name: geometry
       type: geometry
     - name: aeroway
-      key: aeroway
-      type: string
+      type: mapping_value
     - name: area
       type: area
     - name: webmerc_area
       type: webmerc_area
     mapping:
-      aeroway:
-      - aerodrome
-      - heliport
-      - runway
-      - helipad
-      - taxiway
-      - apron
+      aeroway: *aeroway_polygon_mapping
+      "area:aeroway": *aeroway_polygon_mapping
 
   # etldoc: imposm3 -> osm_aeroway_linestring
   aeroway_linestring:
diff --git a/layers/aeroway/mapping_diagram.png b/layers/aeroway/mapping_diagram.png
new file mode 100644
index 0000000..7a102c4
Binary files /dev/null and b/layers/aeroway/mapping_diagram.png differ