diff --git a/data/presets.yaml b/data/presets.yaml
index c2ddb18cf..24c3d5cce 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -284,6 +284,9 @@ en:
           WNW: West-northwest
           # direction=WSW
           WSW: West-southwest
+      castle_type:
+        # castle_type=*
+        label: Type
       clock_direction:
         # direction=*
         label: Direction
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ffe867115..30e94f64c 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -364,6 +364,11 @@
                 }
             }
         },
+        "castle_type": {
+            "key": "castle_type",
+            "type": "combo",
+            "label": "Type"
+        },
         "clock_direction": {
             "key": "direction",
             "type": "combo",
diff --git a/data/presets/fields/castle_type b/data/presets/fields/castle_type
deleted file mode 100644
index fbcddf87e..000000000
--- a/data/presets/fields/castle_type
+++ /dev/null
@@ -1,3 +0,0 @@
-key": "castle_type",
-    "type": "combo",
-"label": "Type"
diff --git a/data/presets/fields/castle_type.json b/data/presets/fields/castle_type.json
new file mode 100644
index 000000000..ea36ca17d
--- /dev/null
+++ b/data/presets/fields/castle_type.json
@@ -0,0 +1,5 @@
+{
+    "key": "castle_type",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index bc329aae5..a6b4f992c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5699,6 +5699,10 @@
             "name": "Boundary Stone"
         },
         "historic/castle": {
+            "fields": [
+                "castle_type",
+                "building_area"
+            ],
             "geometry": [
                 "point",
                 "area"
diff --git a/data/presets/presets/historic/castle.json b/data/presets/presets/historic/castle.json
index fed1adb06..0d9960576 100644
--- a/data/presets/presets/historic/castle.json
+++ b/data/presets/presets/historic/castle.json
@@ -1,4 +1,8 @@
 {
+    "fields": [
+        "castle_type",
+        "building_area"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 2e877fc5a..c39d46f54 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -954,6 +954,9 @@
                         "NNW": "North-northwest"
                     }
                 },
+                "castle_type": {
+                    "label": "Type"
+                },
                 "clock_direction": {
                     "label": "Direction",
                     "options": {