diff --git a/CMakeLists.txt b/CMakeLists.txt
index c38e2b8f6..193d5f76d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1222,8 +1222,11 @@ set(EXPECTED_DATA
   countryflags/EG.png
   countryflags/EH.png
   countryflags/ER.png
+  countryflags/ES-CT.png
+  countryflags/ES-GA.png
   countryflags/ES.png
   countryflags/ET.png
+  countryflags/EU.png
   countryflags/FI.png
   countryflags/FJ.png
   countryflags/FK.png
@@ -1231,6 +1234,10 @@ set(EXPECTED_DATA
   countryflags/FO.png
   countryflags/FR.png
   countryflags/GA.png
+  countryflags/GB-ENG.png
+  countryflags/GB-NIR.png
+  countryflags/GB-SCT.png
+  countryflags/GB-WLS.png
   countryflags/GB.png
   countryflags/GD.png
   countryflags/GE.png
@@ -1396,13 +1403,6 @@ set(EXPECTED_DATA
   countryflags/VU.png
   countryflags/WF.png
   countryflags/WS.png
-  countryflags/XCA.png
-  countryflags/XEN.png
-  countryflags/XEU.png
-  countryflags/XGL.png
-  countryflags/XNI.png
-  countryflags/XSC.png
-  countryflags/XWA.png
   countryflags/YE.png
   countryflags/ZA.png
   countryflags/ZM.png
diff --git a/data/countryflags/XCA.png b/data/countryflags/ES-CT.png
similarity index 100%
rename from data/countryflags/XCA.png
rename to data/countryflags/ES-CT.png
diff --git a/data/countryflags/XGL.png b/data/countryflags/ES-GA.png
similarity index 100%
rename from data/countryflags/XGL.png
rename to data/countryflags/ES-GA.png
diff --git a/data/countryflags/XEU.png b/data/countryflags/EU.png
similarity index 100%
rename from data/countryflags/XEU.png
rename to data/countryflags/EU.png
diff --git a/data/countryflags/XEN.png b/data/countryflags/GB-ENG.png
similarity index 100%
rename from data/countryflags/XEN.png
rename to data/countryflags/GB-ENG.png
diff --git a/data/countryflags/XNI.png b/data/countryflags/GB-NIR.png
similarity index 100%
rename from data/countryflags/XNI.png
rename to data/countryflags/GB-NIR.png
diff --git a/data/countryflags/XSC.png b/data/countryflags/GB-SCT.png
similarity index 100%
rename from data/countryflags/XSC.png
rename to data/countryflags/GB-SCT.png
diff --git a/data/countryflags/XWA.png b/data/countryflags/GB-WLS.png
similarity index 100%
rename from data/countryflags/XWA.png
rename to data/countryflags/GB-WLS.png
diff --git a/data/countryflags/index.txt b/data/countryflags/index.txt
index 8af04d58e..6ea9d4e12 100644
--- a/data/countryflags/index.txt
+++ b/data/countryflags/index.txt
@@ -6,30 +6,30 @@
 default
 == -1
 
-XEN
+##### ISO 3166-2 subdivisions #####
+
+GB-ENG
 == 901
 
-XNI
+GB-NIR
 == 902
 
-XSC
+GB-SCT
 == 903
 
-XWA
+GB-WLS
 == 904
 
-XEU
-== 905
-
-XCA
+ES-CT
 == 906
 
-XGL
+ES-GA
 == 907
 
-#south sudan, non official code#
-SS
-== 737
+##### ISO 3166/MA exceptional reservations #####
+
+EU
+== 905
 
 ##### ISO 3166-1 based #####
 
@@ -648,6 +648,9 @@ SB
 SO
 == 706
 
+SS
+== 737
+
 ZA
 == 710