diff --git a/data/fields/aircraft/model.json b/data/fields/aircraft/model.json
new file mode 100644
index 00000000..c21e77a9
--- /dev/null
+++ b/data/fields/aircraft/model.json
@@ -0,0 +1,5 @@
+{
+    "key": "aircraft:model",
+    "type": "combo",
+    "label": "Aircraft Model"
+}
diff --git a/data/fields/aircraft/model/wikidata.json b/data/fields/aircraft/model/wikidata.json
new file mode 100644
index 00000000..c1f72760
--- /dev/null
+++ b/data/fields/aircraft/model/wikidata.json
@@ -0,0 +1,9 @@
+{
+    "key": "aircraft:model:wikidata",
+    "keys": [
+        "aircraft:model:wikidata",
+        "aircraft:model:wikipedia"
+    ],
+    "type": "wikidata",
+    "label": "Aircraft Model Wikidata"
+}
diff --git a/data/fields/aircraft/type.json b/data/fields/aircraft/type.json
new file mode 100644
index 00000000..ea2d5226
--- /dev/null
+++ b/data/fields/aircraft/type.json
@@ -0,0 +1,16 @@
+{
+    "key": "aircraft:type",
+    "type": "combo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "military": "Military",
+            "helicopter": "Helicopter",
+            "airliner": "Airliner",
+            "jet": "Jet",
+            "fixed_wing": "Fixed Wing",
+            "cargo": "Cargo",
+            "glider": "Glider"
+        }
+    }
+}
diff --git a/data/fields/manufacturer/wikidata.json b/data/fields/manufacturer/wikidata.json
new file mode 100644
index 00000000..5c42886b
--- /dev/null
+++ b/data/fields/manufacturer/wikidata.json
@@ -0,0 +1,9 @@
+{
+    "key": "manufacturer:wikidata",
+    "keys": [
+        "manufacturer:wikidata",
+        "manufacturer:wikipedia"
+    ],
+    "type": "wikidata",
+    "label": "Manufacturer Wikidata"
+}
diff --git a/data/presets/historic/aircraft.json b/data/presets/historic/aircraft.json
new file mode 100644
index 00000000..426e1732
--- /dev/null
+++ b/data/presets/historic/aircraft.json
@@ -0,0 +1,27 @@
+{
+    "icon": "roentgen-plane",
+    "fields": [
+        "name",
+        "start_date",
+        "aircraft/type",
+        "aircraft/model"
+    ],
+    "moreFields": [
+        "ref",
+        "aircraft/model/wikidata",
+        "manufacturer",
+        "manufacturer/wikidata",
+        "description"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "historic": "aircraft"
+    },
+    "terms": [
+        "gate guardian"
+    ],
+    "name": "Historic Aircraft"
+}