diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index e6cc98dc20..02948e2bff 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,15 @@
+2017-07-19  Akhilesh Kumar <akhilesh.k@samsung.com>
+
+	[BZ #21788]
+	* locales/cy_GB (LC_ADDRESS): Add country_post.
+	* locales/hy_AM (LC_ADDRESS): Add country_post.
+	* locales/iu_CA (LC_ADDRESS): Add country_post.
+	* locales/nan_TW@latin (LC_ADDRESS): Add country_post.
+	* locales/ps_AF (LC_ADDRESS): Add country_post.
+	* locales/sr_RS (LC_ADDRESS): Fix country_post.
+	* locales/sr_RS@latin (LC_ADDRESS): Fix country_post.
+	* locales/zh_TW (LC_ADDRESS): Fix country_post.
+
 2017-07-19  Akhilesh Kumar <akhilesh.k@samsung.com>
 
 	[BZ #21784]
diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB
index cc05c209cf..2d278562af 100644
--- a/localedata/locales/cy_GB
+++ b/localedata/locales/cy_GB
@@ -41,7 +41,7 @@ postal_fmt "<U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U006
 <U0025><U0073><U0020><U0025><U0068><U0020><U0035><U0065><U0020><U0025><U0072><U0025><U004E>/
 <U0025><U0043><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0059><U0020><U0044><U0065><U0079><U0072><U006E><U0061><U0073><U0020><U0055><U006E><U0065><U0064><U0069><U0067>"
-% FIXME country_post MAIL_CEPTCODE for country. 'GB' ?
+country_post    "<U0047><U0042>"
 country_ab2 "<U0047><U0042>"
 country_ab3 "<U0047><U0042><U0052>"
 country_num 826
diff --git a/localedata/locales/hy_AM b/localedata/locales/hy_AM
index edd28e0cc0..521264dc43 100644
--- a/localedata/locales/hy_AM
+++ b/localedata/locales/hy_AM
@@ -180,7 +180,7 @@ postal_fmt "<U0025><U0064><U0025><U004E><U0025><U0066><U0025><U004E><U0025><U006
 <U0025><U0073><U0020><U0025><U0068><U0020><U0035><U0065><U0020><U0025><U0072><U0025><U004E>/
 <U0025><U0043><U0025><U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name "<U0540><U0561><U0575><U0561><U057D><U057F><U0561><U0576>"
-% FIXME country_post for Armenia?
+country_post "<U0041><U004D>"
 country_ab2 "<U0041><U004D>"
 country_ab3 "<U0041><U0052><U004D>"
 country_num 051
diff --git a/localedata/locales/iu_CA b/localedata/locales/iu_CA
index 126a91be2b..3c1f9e68e1 100644
--- a/localedata/locales/iu_CA
+++ b/localedata/locales/iu_CA
@@ -44,7 +44,7 @@ postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
 <U004E><U0025><U0054><U0020><U0025><U007A><U0025>/
 <U004E><U0025><U0063><U0025><U004E>"
 % FIXME country_name "Canada" in inuktitut ?
-% FIXME country_post "CA" for Canada ?
+country_post "<U0043><U0041>"
 country_ab2 "<U0043><U0041>"
 country_ab3 "<U0043><U0041><U004E>"
 country_num 124
diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin
index ec1c9e6109..6b9136c8ff 100644
--- a/localedata/locales/nan_TW@latin
+++ b/localedata/locales/nan_TW@latin
@@ -182,7 +182,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 % country_ab3:	TWN
 % country_isbn:	957
 country_name	"<U0054><U00E2><U0069><U002D><U006F><U00E2><U006E>"
-%country_post	"FIXME"
+country_post	"<U0054><U0057>"
 country_ab2	"<U0054><U0057>"
 country_ab3	"<U0054><U0057><U004E>"
 country_num	158
diff --git a/localedata/locales/ps_AF b/localedata/locales/ps_AF
index 2d35456419..0402f139d5 100644
--- a/localedata/locales/ps_AF
+++ b/localedata/locales/ps_AF
@@ -262,7 +262,7 @@ postal_fmt	"<U0025><U0061><U0025><U004E><U0025><U0066><U0025>/
 <U0025><U004E><U0025><U0063><U0025><U004E>"
 country_name	"<U0627><U0641><U063A><U0627><U0646>/
 <U0633><U062A><U0627><U0646>"
-%country_post	"<U0041><U0046><U0047>" % FIXME: Not confirmed.
+country_post	"<U0041><U0046>"
 country_ab2	"<U0041><U0046>"
 country_ab3	"<U0041><U0046><U0047>"
 country_num	004
diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS
index 6d58f87a5a..2db556115c 100644
--- a/localedata/locales/sr_RS
+++ b/localedata/locales/sr_RS
@@ -335,8 +335,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0052><U0053>"
 country_ab3   "<U0053><U0052><U0042>"
-% FIXME: country_post is probably incorrect
-country_post  "<U0053><U0052><U0042>"
+country_post  "<U0052><U0053>"
 country_name  "<U0421><U0440><U0431><U0438><U0458><U0430>"
 country_num   688
 country_car   "<U0053><U0052><U0042>"
diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin
index 6ecfb40a34..6c46927549 100644
--- a/localedata/locales/sr_RS@latin
+++ b/localedata/locales/sr_RS@latin
@@ -155,7 +155,7 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U004E><U0025><U0063><U0025><U004E>"
 country_ab2   "<U0052><U0053>"
 country_ab3   "<U0053><U0052><U0042>"
-country_post  "<U0053><U0052><U0042>"
+country_post  "<U0052><U0053>"
 country_name "<U0053><U0072><U0062><U0069><U006A><U0061>"
 country_num   688
 country_car   "<U0053><U0052><U0042>"
diff --git a/localedata/locales/zh_TW b/localedata/locales/zh_TW
index 913c5947b5..2a54f391eb 100644
--- a/localedata/locales/zh_TW
+++ b/localedata/locales/zh_TW
@@ -184,7 +184,7 @@ postal_fmt	"<U0025><U0063><U0025><U004E><U0025>/
 % country_ab3:	TWN
 % country_isbn:	957
 country_name	"<U4E2D><U83EF><U6C11><U570B>"
-%country_post	"FIXME"
+country_post	"<U0054><U0057>"
 country_ab2	"<U0054><U0057>"
 country_ab3	"<U0054><U0057><U004E>"
 country_num	158