diff --git a/ChangeLog b/ChangeLog
index f238908fe8..c5dc3bed21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2018-06-12  Rafal Luzynski  <digitalfreak@lingonborough.com>
+
+	[BZ #23140]
+	* localedata/locales/gd_GB (mon): Rename to...
+	(alt_mon): This.
+	(mon): Import from CLDR (genitive case).
+	* localedata/locales/hsb_DE (mon): Rename to...
+	(alt_mon): This.
+	(mon): Import from CLDR (genitive case).
+	* localedata/locales/wa_BE (mon): Rename to...
+	(alt_mon): This.
+	(mon): Add, fill with the proper genitive forms, but CLDR data
+	is incomplete; completed according to the comments in this file.
+	(d_t_fmt): Do not use "di" before the month name, no longer needed.
+
+	* localedata/locales/wa_BE (country_name): Reword
+	"Beljike" -> "Beldjike".
+
 2018-06-11  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #23272]
diff --git a/NEWS b/NEWS
index e2a6f45121..d96c7caae8 100644
--- a/NEWS
+++ b/NEWS
@@ -24,9 +24,10 @@ Major new features:
   - fdiv, fdivl, ddivl and corresponding fMdivfN, fMdivfNx, fMxdivfN and
     fMxdivfNx functions.
 
-* Nominative and genitive month names are now supported for the Catalan and
-  Czech languages.  The Catalan and Greek languages now support abbreviated
-  alternative month names.
+* Nominative and genitive month names are now supported for the following
+  languages: Catalan, Czech, Scottish Gaelic, Upper Sorbian, and Walloon.
+  The Catalan and Greek languages now support abbreviated alternative
+  month names.
 
 * Building and running on GNU/Hurd systems now works without out-of-tree
   patches.
diff --git a/localedata/locales/gd_GB b/localedata/locales/gd_GB
index 77d11e5977..8d54593113 100644
--- a/localedata/locales/gd_GB
+++ b/localedata/locales/gd_GB
@@ -54,7 +54,7 @@ END LC_COLLATE
 
 LC_TIME
 % Am Faoilleach, An Gearran, Am Màrt, An Giblean, An Cèitean, An t-Ògmhios, An t-Iuchar, An Lùnastal, An t-Sultain, An Dàmhair, An t-Samhain, An Dùbhlachd
-mon           "Am Faoilleach";/
+alt_mon       "Am Faoilleach";/
      "An Gearran";/
      "Am M<U00E0>rt";/
      "An Giblean";/
@@ -66,6 +66,21 @@ mon           "Am Faoilleach";/
      "An D<U00E0>mhair";/
      "An t-Samhain";/
      "An D<U00F9>bhlachd"
+% dhen Fhaoilleach, dhen Ghearran, dhen Mhàrt, dhen Ghiblean, dhen Chèitean,
+% dhen Ògmhios, dhen Iuchar, dhen Lùnastal, dhen t-Sultain, dhen Dàmhair,
+% dhen t-Samhain, dhen Dùbhlachd
+mon  "dhen Fhaoilleach";/
+     "dhen Ghearran";/
+     "dhen Mh<U00E0>rt";/
+     "dhen Ghiblean";/
+     "dhen Ch<U00E8>itean";/
+     "dhen <U00D2>gmhios";/
+     "dhen Iuchar";/
+     "dhen L<U00F9>nastal";/
+     "dhen t-Sultain";/
+     "dhen D<U00E0>mhair";/
+     "dhen t-Samhain";/
+     "dhen D<U00F9>bhlachd"
 % Faoi, Gearr, Màrt, Gibl, Cèit, Ògmh, Iuch, Lùna, Sult, Dàmh, Samh, Dùbh
 abmon         "Faoi";/
        "Gearr";/
diff --git a/localedata/locales/hsb_DE b/localedata/locales/hsb_DE
index 492c2c7e31..13fc8e91f5 100644
--- a/localedata/locales/hsb_DE
+++ b/localedata/locales/hsb_DE
@@ -170,7 +170,7 @@ abmon	"Jan";"Feb";/
 	"Jul";"Awg";/
 	"Sep";"Okt";/
 	"Now";"Dec"
-mon	"Januar";/
+alt_mon	"Januar";/
 	"Februar";/
 	"M<U011B>rc";/
 	"Apryl";/
@@ -182,6 +182,18 @@ mon	"Januar";/
 	"Oktober";/
 	"Nowember";/
 	"December"
+mon	"januara";/
+	"februara";/
+	"m<U011B>rca";/
+	"apryla";/
+	"meje";/
+	"junija";/
+	"julija";/
+	"awgusta";/
+	"septembra";/
+	"oktobra";/
+	"nowembra";/
+	"decembra"
 d_t_fmt "%a %d %b %Y %T %Z"
 d_fmt   "%d.%m.%Y"
 t_fmt   "%T"
diff --git a/localedata/locales/wa_BE b/localedata/locales/wa_BE
index 2db2c045d9..e97493089e 100644
--- a/localedata/locales/wa_BE
+++ b/localedata/locales/wa_BE
@@ -37,7 +37,7 @@ END LC_IDENTIFICATION
 
 LC_ADDRESS
 postal_fmt    "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N"
-country_name "Beljike"
+country_name "Beldjike"
 country_post "B"
 country_ab2 "BE"
 country_ab3 "BEL"
@@ -121,7 +121,7 @@ abmon   "dja";"fev";/
         "djl";"awo";/
         "set";"oct";/
         "n<U00F4>v";"dec"
-mon     "djanv<U00EE>";/
+alt_mon "djanv<U00EE>";/
         "fevr<U00EE>";/
         "m<U00E5>ss";/
         "avri";/
@@ -147,12 +147,20 @@ mon     "djanv<U00EE>";/
 % d' octôbe
 % di nôvimbe
 % di decimbe
-% Est çki c' est possibe d' aveur "di" ou "d'" sorlon ki li no do moes
-% cmince avou ene voyale ou ene cossoune?
-%
-% Neni :-(
+mon     "di djanv<U00EE>";/
+        "di fevr<U00EE>";/
+        "di m<U00E5>ss";/
+        "d<U2019><U00A0>avri";/
+        "di may";/
+        "di djun";/
+        "di djulete";/
+        "d<U2019><U00A0>awousse";/
+        "di setimbe";/
+        "d<U2019><U00A0>oct<U00F4>be";/
+        "di n<U00F4>vimbe";/
+        "di decimbe"
 
-d_t_fmt "Li %A %d di %B %Y %T %Z"
+d_t_fmt "Li %A %d %B %Y %T %Z"
 % Chal, ça va
 d_fmt   "%d//%m//%Y"
 t_fmt   "%H:%M:%S"