diff --git a/data/presets.yaml b/data/presets.yaml
index 5ca470ebe..76ff217b1 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -102,6 +102,10 @@ en:
         label: Type
       historic: 
         label: Type
+      iata: 
+        label: IATA
+      icao: 
+        label: ICAO
       incline: 
         label: Incline
       internet_access: 
@@ -218,9 +222,27 @@ en:
       aeroway/aerodrome: 
         name: Airport
         terms: "airplane,airport,aerodrome"
+      aeroway/apron: 
+        name: Apron
+        terms: ramp
+      aeroway/gate: 
+        name: Airport gate
+        terms: ""
+      aeroway/hangar: 
+        name: Hangar
+        terms: ""
       aeroway/helipad: 
         name: Helipad
         terms: "helicopter,helipad,heliport"
+      aeroway/runway: 
+        name: Runway
+        terms: landing strip
+      aeroway/taxiway: 
+        name: Taxiway
+        terms: ""
+      aeroway/terminal: 
+        name: Airport terminal
+        terms: "airport,aerodrome"
       amenity: 
         name: Amenity
         terms: ""
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 23ef796e8..65a27c08d 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -230,6 +230,16 @@
         "type": "combo",
         "label": "Type"
     },
+    "iata": {
+        "key": "iata",
+        "type": "text",
+        "label": "IATA"
+    },
+    "icao": {
+        "key": "icao",
+        "type": "text",
+        "label": "ICAO"
+    },
     "incline": {
         "key": "incline",
         "type": "combo",
diff --git a/data/presets/fields/iata.json b/data/presets/fields/iata.json
new file mode 100644
index 000000000..572eea5ab
--- /dev/null
+++ b/data/presets/fields/iata.json
@@ -0,0 +1,5 @@
+{
+    "key": "iata",
+    "type": "text",
+    "label": "IATA"
+}
diff --git a/data/presets/fields/icao.json b/data/presets/fields/icao.json
new file mode 100644
index 000000000..f666eaa88
--- /dev/null
+++ b/data/presets/fields/icao.json
@@ -0,0 +1,5 @@
+{
+    "key": "icao",
+    "type": "text",
+    "label": "ICAO"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4d8222167..9aba80573 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -26,11 +26,59 @@
             "airport",
             "aerodrome"
         ],
+        "fields": [
+            "ref",
+            "iata",
+            "icao",
+            "operator"
+        ],
         "tags": {
             "aeroway": "aerodrome"
         },
         "name": "Airport"
     },
+    "aeroway/apron": {
+        "icon": "airport",
+        "geometry": [
+            "area"
+        ],
+        "terms": [
+            "ramp"
+        ],
+        "fields": [
+            "ref",
+            "surface"
+        ],
+        "tags": {
+            "aeroway": "apron"
+        },
+        "name": "Apron"
+    },
+    "aeroway/gate": {
+        "icon": "airport",
+        "geometry": [
+            "point"
+        ],
+        "fields": [
+            "ref"
+        ],
+        "tags": {
+            "aeroway": "gate"
+        },
+        "name": "Airport gate"
+    },
+    "aeroway/hangar": {
+        "geometry": [
+            "area"
+        ],
+        "fields": [
+            "building_area"
+        ],
+        "tags": {
+            "aeroway": "hangar"
+        },
+        "name": "Hangar"
+    },
     "aeroway/helipad": {
         "icon": "heliport",
         "geometry": [
@@ -47,6 +95,54 @@
         },
         "name": "Helipad"
     },
+    "aeroway/runway": {
+        "geometry": [
+            "line",
+            "area"
+        ],
+        "terms": [
+            "landing strip"
+        ],
+        "fields": [
+            "ref",
+            "surface"
+        ],
+        "tags": {
+            "aeroway": "runway"
+        },
+        "name": "Runway"
+    },
+    "aeroway/taxiway": {
+        "geometry": [
+            "line"
+        ],
+        "fields": [
+            "ref",
+            "surface"
+        ],
+        "tags": {
+            "aeroway": "taxiway"
+        },
+        "name": "Taxiway"
+    },
+    "aeroway/terminal": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "airport",
+            "aerodrome"
+        ],
+        "fields": [
+            "operator",
+            "building_area"
+        ],
+        "tags": {
+            "aeroway": "terminal"
+        },
+        "name": "Airport terminal"
+    },
     "amenity": {
         "fields": [
             "amenity"
diff --git a/data/presets/presets/aeroway/aerodrome.json b/data/presets/presets/aeroway/aerodrome.json
index e1756619e..113f0dbe6 100644
--- a/data/presets/presets/aeroway/aerodrome.json
+++ b/data/presets/presets/aeroway/aerodrome.json
@@ -9,8 +9,14 @@
         "airport",
         "aerodrome"
     ],
+    "fields": [
+        "ref",
+        "iata",
+        "icao",
+        "operator"
+    ],
     "tags": {
         "aeroway": "aerodrome"
     },
     "name": "Airport"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/aeroway/apron.json b/data/presets/presets/aeroway/apron.json
new file mode 100644
index 000000000..b73f06a1f
--- /dev/null
+++ b/data/presets/presets/aeroway/apron.json
@@ -0,0 +1,17 @@
+{
+    "icon": "airport",
+    "geometry": [
+        "area"
+    ],
+    "terms": [
+        "ramp"
+    ],
+    "fields": [
+        "ref",
+        "surface"
+    ],
+    "tags": {
+        "aeroway": "apron"
+    },
+    "name": "Apron"
+}
diff --git a/data/presets/presets/aeroway/gate.json b/data/presets/presets/aeroway/gate.json
new file mode 100644
index 000000000..1926c5364
--- /dev/null
+++ b/data/presets/presets/aeroway/gate.json
@@ -0,0 +1,11 @@
+{
+    "icon": "airport",
+    "geometry": [
+        "point"
+    ],
+    "fields": ["ref"],
+    "tags": {
+        "aeroway": "gate"
+    },
+    "name": "Airport gate"
+}
diff --git a/data/presets/presets/aeroway/hangar.json b/data/presets/presets/aeroway/hangar.json
new file mode 100644
index 000000000..f59425023
--- /dev/null
+++ b/data/presets/presets/aeroway/hangar.json
@@ -0,0 +1,12 @@
+{
+    "geometry": [
+        "area"
+    ],
+    "fields": [
+        "building_area"
+    ],
+    "tags": {
+        "aeroway": "hangar"
+    },
+    "name": "Hangar"
+}
diff --git a/data/presets/presets/aeroway/runway.json b/data/presets/presets/aeroway/runway.json
new file mode 100644
index 000000000..1c0a688fe
--- /dev/null
+++ b/data/presets/presets/aeroway/runway.json
@@ -0,0 +1,17 @@
+{
+    "geometry": [
+        "line",
+        "area"
+    ],
+    "terms": [
+        "landing strip"
+    ],
+    "fields": [
+        "ref",
+        "surface"
+    ],
+    "tags": {
+        "aeroway": "runway"
+    },
+    "name": "Runway"
+}
diff --git a/data/presets/presets/aeroway/taxiway.json b/data/presets/presets/aeroway/taxiway.json
new file mode 100644
index 000000000..2f389be5d
--- /dev/null
+++ b/data/presets/presets/aeroway/taxiway.json
@@ -0,0 +1,13 @@
+{
+    "geometry": [
+        "line"
+    ],
+    "fields": [
+        "ref",
+        "surface"
+    ],
+    "tags": {
+        "aeroway": "taxiway"
+    },
+    "name": "Taxiway"
+}
diff --git a/data/presets/presets/aeroway/terminal.json b/data/presets/presets/aeroway/terminal.json
new file mode 100644
index 000000000..bebf16c71
--- /dev/null
+++ b/data/presets/presets/aeroway/terminal.json
@@ -0,0 +1,18 @@
+{
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "airport",
+        "aerodrome"
+    ],
+    "fields": [
+        "operator",
+        "building_area"
+    ],
+    "tags": {
+        "aeroway": "terminal"
+    },
+    "name": "Airport terminal"
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index d3de37adf..f29dbf73d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -462,6 +462,12 @@
             "historic": {
                 "label": "Type"
             },
+            "iata": {
+                "label": "IATA"
+            },
+            "icao": {
+                "label": "ICAO"
+            },
             "incline": {
                 "label": "Incline"
             },
@@ -629,10 +635,34 @@
                 "name": "Airport",
                 "terms": "airplane,airport,aerodrome"
             },
+            "aeroway/apron": {
+                "name": "Apron",
+                "terms": "ramp"
+            },
+            "aeroway/gate": {
+                "name": "Airport gate",
+                "terms": ""
+            },
+            "aeroway/hangar": {
+                "name": "Hangar",
+                "terms": ""
+            },
             "aeroway/helipad": {
                 "name": "Helipad",
                 "terms": "helicopter,helipad,heliport"
             },
+            "aeroway/runway": {
+                "name": "Runway",
+                "terms": "landing strip"
+            },
+            "aeroway/taxiway": {
+                "name": "Taxiway",
+                "terms": ""
+            },
+            "aeroway/terminal": {
+                "name": "Airport terminal",
+                "terms": "airport,aerodrome"
+            },
             "amenity": {
                 "name": "Amenity",
                 "terms": ""