diff --git a/ChangeLog b/ChangeLog
index fad81020d8..2851b39385 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2019-07-17  Rafal Luzynski  <digitalfreak@lingonborough.com>
+
+	[BZ #21897]
+	* localedata/locales/aa_DJ (abday): Update from CLDR, all words
+	begin with an uppercase letter now.
+	(abmon): Likewise.
+	(mon): Update from CLDR, reword February from "Kudo" to
+	"Naharsi Kudo", April from "Agda Baxisso" to "Agda Baxis",
+	and August from "Liiqen" to "Leqeeni".
+	* localedata/locales/aa_ER (mon): Update from CLDR, reword
+	April from "Agda Baxisso" to "Agda Baxis" and August from
+	"Leqeeni" to "Liiqen".
+	* localedata/locales/aa_ER@saaho (mon): Likewise.
+	* localedata/locales/aa_ET (abmon): Update from CLDR, reword
+	abbreviated February from "Kud" to "Nah".
+	(mon): Update from CLDR, reword February from "Kudo" to
+	"Naharsi Kudo" and April from "Agda Baxisso" to "Agda Baxis".
+
 2019-07-17  Rafal Luzynski  <digitalfreak@lingonborough.com>
 
 	[BZ #23996]
diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
index 98e1505404..5e900ac66c 100644
--- a/localedata/locales/aa_DJ
+++ b/localedata/locales/aa_DJ
@@ -181,7 +181,7 @@ LC_TIME
 %
 % Abbreviated weekday names (%a)
 %
-abday    "aca";"etl";"tal";"arb";"kam";"gum";"sab"
+abday    "Aca";"Etl";"Tal";"Arb";"Kam";"Gum";"Sab"
 %
 % Full weekday names (%A)
 %
@@ -195,18 +195,18 @@ day      "Acaada";/
 %
 % Abbreviated month names (%b)
 %
-abmon    "qun";"nah";"cig";"agd";"cax";"qas";"qad";"leq";"way";"dit";"xim";"kax"
+abmon    "Qun";"Nah";"Cig";"Agd";"Cax";"Qas";"Qad";"Leq";"Way";"Dit";"Xim";"Kax"
 %
 % Full month names (%B)
 %
 mon      "Qunxa Garablu";/
-         "Kudo";/
+         "Naharsi Kudo";/
          "Ciggilta Kudo";/
-         "Agda Baxisso";/
+         "Agda Baxis";/
          "Caxah Alsa";/
          "Qasa Dirri";/
          "Qado Dirri";/
-         "Liiqen";/
+         "Leqeeni";/
          "Waysu";/
          "Diteli";/
          "Ximoli";/
diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER
index 6d20ae907b..2d23b0f93c 100644
--- a/localedata/locales/aa_ER
+++ b/localedata/locales/aa_ER
@@ -176,11 +176,11 @@ abmon    "Qun";/
 mon      "Qunxa Garablu";/
          "Naharsi Kudo";/
          "Ciggilta Kudo";/
-         "Agda Baxisso";/
+         "Agda Baxis";/
          "Caxah Alsa";/
          "Qasa Dirri";/
          "Qado Dirri";/
-         "Leqeeni";/
+         "Liiqen";/
          "Waysu";/
          "Diteli";/
          "Ximoli";/
diff --git a/localedata/locales/aa_ER@saaho b/localedata/locales/aa_ER@saaho
index 1a2b16676f..728dcfb879 100644
--- a/localedata/locales/aa_ER@saaho
+++ b/localedata/locales/aa_ER@saaho
@@ -161,11 +161,11 @@ abmon    "Qun";/
 mon      "Qunxa Garablu";/
          "Naharsi Kudo";/
          "Ciggilta Kudo";/
-         "Agda Baxisso";/
+         "Agda Baxis";/
          "Caxah Alsa";/
          "Qasa Dirri";/
          "Qado Dirri";/
-         "Leqeeni";/
+         "Liiqen";/
          "Waysu";/
          "Diteli";/
          "Ximoli";/
diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET
index 93fcdb7ff9..1bc7c4a7d9 100644
--- a/localedata/locales/aa_ET
+++ b/localedata/locales/aa_ET
@@ -161,7 +161,7 @@ day      "Acaada";/
 % Abbreviated month names (%b)
 %
 abmon    "Qun";/
-         "Kud";/
+         "Nah";/
          "Cig";/
          "Agd";/
          "Cax";/
@@ -176,9 +176,9 @@ abmon    "Qun";/
 % Full month names (%B)
 %
 mon      "Qunxa Garablu";/
-         "Kudo";/
+         "Naharsi Kudo";/
          "Ciggilta Kudo";/
-         "Agda Baxisso";/
+         "Agda Baxis";/
          "Caxah Alsa";/
          "Qasa Dirri";/
          "Qado Dirri";/