diff --git a/data/presets.yaml b/data/presets.yaml
index 90ed11140..b68ed8d36 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -475,6 +475,9 @@ en:
       country:
         # country=*
         label: Country
+      country_flag:
+        # country=*
+        label: Flag Country
       couplings:
         # couplings=*
         label: Couplings
diff --git a/data/presets/fields.json b/data/presets/fields.json
index d716f71fe..d0cb241e4 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -80,6 +80,7 @@
     "content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]},
     "conveying_escalator": {"key": "conveying", "type": "check", "label": "Escalator"},
     "conveying": {"key": "conveying", "type": "typeCombo", "label": "Movement Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "reversible": "Reversible"}}},
+    "country_flag": {"key": "country", "type": "combo", "label": "Flag Country", "prerequisiteTag": {"key": "flag:type", "value": "national"}},
     "country": {"key": "country", "type": "combo", "label": "Country"},
     "couplings": {"key": "couplings", "type": "number", "minValue": 1, "label": "Couplings", "placeholder": "1, 2, 3..."},
     "covered": {"key": "covered", "type": "check", "label": "Covered"},
diff --git a/data/presets/fields/country_flag.json b/data/presets/fields/country_flag.json
new file mode 100644
index 000000000..77cdf30f2
--- /dev/null
+++ b/data/presets/fields/country_flag.json
@@ -0,0 +1,9 @@
+{
+    "key": "country",
+    "type": "combo",
+    "label": "Flag Country",
+    "prerequisiteTag": {
+        "key": "flag:type",
+        "value": "national"
+    }
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e2fdd7392..554001f6d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -729,7 +729,7 @@
     "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"},
     "man_made/dyke": {"geometry": ["line"], "tags": {"man_made": "dyke"}, "terms": ["Dike", "Dyke", "Floodbank", "Stopbank"], "name": "Levee"},
     "man_made/embankment": {"geometry": ["line"], "tags": {"man_made": "embankment"}, "name": "Embankment"},
-    "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country", "lit", "height"], "moreFields": ["manufacturer", "material"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
+    "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country_flag", "lit", "height"], "moreFields": ["manufacturer", "material"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
     "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"},
     "man_made/groyne": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
     "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["name", "operator", "building_area", "height"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "phone", "seamark/type", "website"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "addTags": {"man_made": "lighthouse", "seamark:type": "light_major"}, "removeTags": {"man_made": "lighthouse", "seamark:type": "*"}, "name": "Lighthouse"},
diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json
index ccb7ecbfa..6877ca69c 100644
--- a/data/presets/presets/man_made/flagpole.json
+++ b/data/presets/presets/man_made/flagpole.json
@@ -3,7 +3,7 @@
     "fields": [
         "operator",
         "flag/type",
-        "country",
+        "country_flag",
         "lit",
         "height"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index e14b9f258..b4e6dbd09 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1349,7 +1349,7 @@
     {"key": "conveying", "value": "forward", "description": "🄵 Movement Direction"},
     {"key": "conveying", "value": "backward", "description": "🄵 Movement Direction"},
     {"key": "conveying", "value": "reversible", "description": "🄵 Movement Direction"},
-    {"key": "country", "description": "🄵 Country"},
+    {"key": "country", "description": "🄵 Flag Country, 🄵 Country"},
     {"key": "couplings", "description": "🄵 Couplings"},
     {"key": "covered", "description": "🄵 Covered"},
     {"key": "crane:type", "value": "portal_crane", "description": "🄵 Crane Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 09a2351f4..bc858a569 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2923,6 +2923,9 @@
                         "reversible": "Reversible"
                     }
                 },
+                "country_flag": {
+                    "label": "Flag Country"
+                },
                 "country": {
                     "label": "Country"
                 },