diff --git a/kgeography/data/flags/russia/CMakeLists.txt b/kgeography/data/flags/russia/CMakeLists.txt
index f579e44..f613b21 100644
--- a/kgeography/data/flags/russia/CMakeLists.txt
+++ b/kgeography/data/flags/russia/CMakeLists.txt
@@ -14,7 +14,9 @@ install(FILES
 	chelyabinsk_oblast.png
 	chukotka.png
 	chuvashia.png
+	crimea.png
 	dagestan.png
+	donetsk.png
 	ingushetia.png
 	irkutsk_oblast.png
 	ivanovo_oblast.png
@@ -31,6 +33,7 @@ install(FILES
 	khakassia.png
 	khantia-mansia.png
 	kirov_oblast.png
+	kherson.png
 	komi.png
 	kostroma_oblast.png
 	krasnodar_krai.png
@@ -39,6 +42,7 @@ install(FILES
 	kursk_oblast.png
 	leningrad_oblast.png
 	lipetsk_oblast.png
+	lugansk.png
 	magadan_oblast.png
 	mari_el.png
 	mordovia.png
@@ -63,6 +67,7 @@ install(FILES
 	sakha.png
 	samara_oblast.png
 	saratov_oblast.png
+	sevastopol.png
 	smolensk_oblast.png
 	stavropol_krai.png
 	sverdlovsk_oblast.png
@@ -82,6 +87,7 @@ install(FILES
 	yamal-nenets_autonomous_district.png
 	yaroslavl_oblast.png
 	zabaykalsky_krai.png
+	zaporozhye.png
 
 	DESTINATION ${KDE_INSTALL_DATADIR}/kgeography/flags/russia)
 
--- a/kgeography/data/flags/ukraine/CMakeLists.txt
+++ b/kgeography/data/flags/ukraine/CMakeLists.txt
@@ -4,7 +4,6 @@
 install(FILES
 Cherkasy.png
 blurred_Cherkasy.png
-Crimea.png         
 Ivano-Frankivsk.png  
 Khmelnitsky.png  
 Kyiv.png     
@@ -16,14 +15,9 @@ Chernigiv.png
 Dnipopetrovsk.png  
 Kharkiv.png          
 Kirovohrad.png   
-Lugansk.png  
 Odesa.png      
-Sevastopol-city.png  
 Vinnytsa.png  
-Zaporizhya.png
 Chernivtsi.png  
-Donetsk.png        
-Kherson.png          
 Kyiv-city.png    
 Lviv.png     
 Poltava.png    
diff --git a/kgeography/data/russia_subjects.kgm b/kgeography/data/russia_subjects.kgm
index 062abd0..575b1cf 100644
--- a/kgeography/data/russia_subjects.kgm
+++ b/kgeography/data/russia_subjects.kgm
@@ -26,6 +26,15 @@
 		<flag>russia/adygeya.png</flag>
 		<color><red>229</red><green>230</green><blue>179</blue></color>
 	</division>
+	<division>
+		<name>City of Sevastopol'</name><ignore>allowClickMode</ignore><flag>russia/sevastopol.png</flag>
+		<color><red>0</red><green>0</green><blue>255</blue></color>
+	</division>
+	<division>
+		<name>Autonomous Republic of Crimea</name>
+		<capital>Simferopol'</capital><flag>russia/crimea.png</flag>
+		<color><red>255</red><green>0</green><blue>255</blue></color>
+	</division>
 	<division>
 		<name>Bashkortostan</name>
 		<capital>Ufa</capital>
@@ -50,6 +59,26 @@
 		<flag>russia/dagestan.png</flag>
 		<color><red>51</red><green>153</green><blue>102</blue></color>
 	</division>
+	<division>
+		<name>People's Republic of Donetsk</name>
+		<capital>Donetsk</capital><flag>russia/donetsk.png</flag>
+		<color><red>31</red><green>26</green><blue>23</blue></color>
+	</division>
+	<division>
+		<name>Zaporozhskaya oblast'</name>
+		<capital>Zaporozhye</capital><flag>russia/zaporozhye.png</flag>
+		<color><red>128</red><green>0</green><blue>0</blue></color>
+	</division>
+	<division>
+		<name>Khersonskaya oblast'</name>
+		<capital>Kherson</capital><flag>russia/kherson.png</flag>
+		<color><red>128</red><green>128</green><blue>128</blue></color>
+	</division>
+	<division>
+		<name>People's Republic of Lugansk</name>
+		<capital>Lugansk</capital><flag>russia/lugansk.png</flag>
+		<color><red>255</red><green>128</green><blue>255</blue></color>
+	</division>
 	<division>
 		<name>Ingushetia</name>
 		<capital>Magas</capital>
diff --git a/kgeography/data/ukraine.kgm b/kgeography/data/ukraine.kgm
index e9d413a..ac6efdf 100644
--- a/kgeography/data/ukraine.kgm
+++ b/kgeography/data/ukraine.kgm
@@ -126,46 +126,11 @@
 <color> <red> 192 </red> <green> 192 </green> <blue> 192 </blue> </color> 
 </division>
 
-<division> 
-<name>Donets'ka oblast'</name>
-<capital>Donets'k</capital> <flag>ukraine/Donetsk.png</flag>
-<color> <red> 31 </red> <green> 26 </green> <blue> 23 </blue> </color>
-</division>
-
-<division> 
-<name>Zaporiz'ka oblast'</name>
-<capital>Zaporizhzhia</capital> <flag>ukraine/Zaporizhya.png</flag>
-<color> <red> 128 </red> <green> 0 </green> <blue> 0 </blue> </color> 
-</division>
-
-<division> 
-<name>Khersons'ka oblast'</name>
-<capital>Kherson</capital> <flag>ukraine/Kherson.png</flag>
-<color> <red> 128 </red> <green> 128 </green> <blue> 128 </blue> </color> 
-</division>
-
-<division> 
-<name>Luhans'ka oblast'</name>
-<capital>Luhans'k</capital> <flag>ukraine/Lugansk.png</flag>
-<color> <red> 255 </red> <green> 128 </green> <blue> 255 </blue> </color> 
-</division>
-
-<division> 
-<name>Autonomous Republic of Crimea</name>
-<capital>Simferopol'</capital> <flag>ukraine/Crimea.png</flag>
-<color> <red> 255 </red> <green> 0 </green> <blue> 255 </blue> </color> 
-</division>
-
 <division> 
 <name>City of Kyiv</name> <ignore>allowClickMode</ignore> <flag>ukraine/Kyiv-city.png</flag>
 <color> <red> 0 </red> <green> 0 </green> <blue> 247 </blue> </color> 
 </division>
 
-<division> 
-<name>City of Sevastopol'</name> <ignore>allowClickMode</ignore> <flag>ukraine/Sevastopol-city.png</flag>
-<color> <red> 0 </red> <green> 0 </green> <blue> 253 </blue> </color> 
-</division>
-
 <division> 
 <name>Dnipro</name>
 <capital></capital><ignore>yes</ignore>
diff --git a/kgeography/po/ru/kgeography.po b/kgeography/po/ru/kgeography.po
index 1745149..7a6ad42 100644
--- a/kgeography/po/ru/kgeography.po
+++ b/kgeography/po/ru/kgeography.po
@@ -35795,61 +35795,61 @@ msgstr "Днепр"
 
 #: ukraine.kgm:130
 #, kde-format
-msgctxt "ukraine.kgm"
-msgid "Donets'ka oblast'"
-msgstr "Донецкая область"
+msgctxt "russia_subjects.kgm"
+msgid "People's Republic of Donetsk"
+msgstr "Донецкая Народная Республика"
 
 #: ukraine.kgm:131
 #, kde-format
-msgctxt "ukraine.kgm"
-msgid "Donets'k"
+msgctxt "russia_subjects.kgm"
+msgid "Donetsk"
 msgstr "Донецк"
 
 #: ukraine.kgm:136
 #, kde-format
-msgctxt "ukraine.kgm"
-msgid "Zaporiz'ka oblast'"
+msgctxt "russia_subjects.kgm"
+msgid "Zaporozhskaya oblast'"
 msgstr "Запорожская область"
 
 #: ukraine.kgm:137
 #, kde-format
-msgctxt "ukraine.kgm"
-msgid "Zaporizhzhia"
+msgctxt "russia_subjects.kgm"
+msgid "Zaporozhye"
 msgstr "Запорожье"
 
 #: ukraine.kgm:142
 #, kde-format
-msgctxt "ukraine.kgm"
-msgid "Khersons'ka oblast'"
+msgctxt "russia_subjects.kgm"
+msgid "Khersonskaya oblast'"
 msgstr "Херсонская область"
 
 #: ukraine.kgm:143
 #, kde-format
-msgctxt "ukraine.kgm"
+msgctxt "russia_subjects.kgm"
 msgid "Kherson"
 msgstr "Херсон"
 
 #: ukraine.kgm:148
 #, kde-format
-msgctxt "ukraine.kgm"
-msgid "Luhans'ka oblast'"
-msgstr "Луганская область"
+msgctxt "russia_subjects.kgm"
+msgid "People's Republic of Lugansk"
+msgstr "Луганская Народная Республика"
 
 #: ukraine.kgm:149
 #, kde-format
-msgctxt "ukraine.kgm"
-msgid "Luhans'k"
+msgctxt "russia_subjects.kgm"
+msgid "Lugansk"
 msgstr "Луганск"
 
 #: ukraine.kgm:154
 #, kde-format
-msgctxt "ukraine.kgm"
+msgctxt "russia_subjects.kgm"
 msgid "Autonomous Republic of Crimea"
 msgstr "Автономная Республика Крым"
 
 #: ukraine.kgm:155
 #, kde-format
-msgctxt "ukraine.kgm"
+msgctxt "russia_subjects.kgm"
 msgid "Simferopol'"
 msgstr "Симферополь"
 
@@ -35861,7 +35861,7 @@ msgstr "город Киев"
 
 #: ukraine.kgm:165
 #, kde-format
-msgctxt "ukraine.kgm"
+msgctxt "russia_subjects.kgm"
 msgid "City of Sevastopol'"
 msgstr "город Севастополь"