diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 05ccd90dd6..938b6586d2 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,39 @@
+2016-02-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* locales/aa_DJ: Delete trailing whitespace & comments.
+	* locales/aa_ER: Likewise.
+	* locales/aa_ER@saaho: Likewise.
+	* locales/aa_ET: Likewise.
+	* locales/am_ET: Likewise.
+	* locales/ber_DZ: Likewise.
+	* locales/byn_ER: Likewise.
+	* locales/cs_CZ: Likewise.
+	* locales/fil_PH: Likewise.
+	* locales/gez_ER: Likewise.
+	* locales/gez_ER@abegede: Likewise.
+	* locales/gez_ET: Likewise.
+	* locales/gez_ET@abegede: Likewise.
+	* locales/ha_NG: Likewise.
+	* locales/ig_NG: Likewise.
+	* locales/ik_CA: Likewise.
+	* locales/iu_CA: Likewise.
+	* locales/nso_ZA: Likewise.
+	* locales/om_ET: Likewise.
+	* locales/om_KE: Likewise.
+	* locales/ps_AF: Likewise.
+	* locales/ro_RO: Likewise.
+	* locales/sid_ET: Likewise.
+	* locales/so_DJ: Likewise.
+	* locales/so_ET: Likewise.
+	* locales/so_KE: Likewise.
+	* locales/so_SO: Likewise.
+	* locales/ti_ER: Likewise.
+	* locales/ti_ET: Likewise.
+	* locales/tig_ER: Likewise.
+	* locales/wal_ET: Likewise.
+	* locales/wo_SN: Likewise.
+	* locales/yo_NG: Likewise.
+
 2016-02-08  Mike Frysinger  <vapier@gentoo.org>
 
 	* locales/an_ES: Convert to UTF-8 encodings.
diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
index 078f2556b1..c363352d62 100644
--- a/localedata/locales/aa_DJ
+++ b/localedata/locales/aa_DJ
@@ -274,4 +274,3 @@ date_fmt    "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER
index 38bc073534..6bd54d92cd 100644
--- a/localedata/locales/aa_ER
+++ b/localedata/locales/aa_ER
@@ -229,4 +229,3 @@ date_fmt    "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0065><U00
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/aa_ER@saaho b/localedata/locales/aa_ER@saaho
index 63c1cb9a4f..d0c7c5128c 100644
--- a/localedata/locales/aa_ER@saaho
+++ b/localedata/locales/aa_ER@saaho
@@ -209,4 +209,3 @@ date_fmt    "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0065><U00
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET
index c433fbccdb..dc5ba6fbe0 100644
--- a/localedata/locales/aa_ET
+++ b/localedata/locales/aa_ET
@@ -232,4 +232,3 @@ date_fmt    "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0065><U00
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET
index 666e984ba3..35e468765d 100644
--- a/localedata/locales/am_ET
+++ b/localedata/locales/am_ET
@@ -1570,4 +1570,3 @@ date_fmt    "<U0025><U0041><U1363><U0020><U0025><U0042><U0020><U0025><U0065>/
 <U0020><U12D3><U002F><U121D>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/ber_DZ b/localedata/locales/ber_DZ
index 2f03f9bfac..474c75b688 100644
--- a/localedata/locales/ber_DZ
+++ b/localedata/locales/ber_DZ
@@ -310,5 +310,3 @@ tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
 int_prefix  "<U0032><U0031><U0033>"
 
 END LC_TELEPHONE
-
-
diff --git a/localedata/locales/byn_ER b/localedata/locales/byn_ER
index 299a36ab8b..435198d8d0 100644
--- a/localedata/locales/byn_ER
+++ b/localedata/locales/byn_ER
@@ -221,4 +221,3 @@ date_fmt    "<U0025><U0041><U1361><U0020><U0025><U0042><U0020><U0025><U0065>/
 <U0020><U12A3><U12F5>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 6677330ea3..8ad11545d5 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -2502,6 +2502,3 @@ lang_ab       "<U0063><U0073>"
 lang_term     "<U0063><U0065><U0073>"
 lang_lib      "<U0063><U007A><U0065>"
 END LC_ADDRESS
-
-%% END OF LOCALIZATION FILE for cs_CZ.ISO-8859-2
-%% Konec lokalizačního souboru pro české prostředí
diff --git a/localedata/locales/fil_PH b/localedata/locales/fil_PH
index 5f90910022..58cead36d0 100644
--- a/localedata/locales/fil_PH
+++ b/localedata/locales/fil_PH
@@ -195,4 +195,3 @@ END LC_ADDRESS
 LC_TELEPHONE
 copy "tl_PH"
 END LC_TELEPHONE
-
diff --git a/localedata/locales/gez_ER b/localedata/locales/gez_ER
index fb8f7ca7d1..712de15253 100644
--- a/localedata/locales/gez_ER
+++ b/localedata/locales/gez_ER
@@ -218,4 +218,3 @@ date_fmt    "<U0025><U0041><U1365><U0025><U0042><U1361><U0025><U0065>/
 <U1361><U12D3><U002F><U121D>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/gez_ER@abegede b/localedata/locales/gez_ER@abegede
index f3e0b9afc4..5d700b3839 100644
--- a/localedata/locales/gez_ER@abegede
+++ b/localedata/locales/gez_ER@abegede
@@ -157,4 +157,3 @@ END LC_NAME
 LC_TIME
 copy "gez_ER"
 END LC_TIME
-%
diff --git a/localedata/locales/gez_ET b/localedata/locales/gez_ET
index 13cd5f4e63..b0eea50fea 100644
--- a/localedata/locales/gez_ET
+++ b/localedata/locales/gez_ET
@@ -218,4 +218,3 @@ date_fmt    "<U0025><U0041><U1365><U0025><U0042><U1361><U0025><U0065>/
 <U1361><U12D3><U002F><U121D>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/gez_ET@abegede b/localedata/locales/gez_ET@abegede
index 3377c1e550..423c8ae71a 100644
--- a/localedata/locales/gez_ET@abegede
+++ b/localedata/locales/gez_ET@abegede
@@ -113,4 +113,3 @@ END LC_NAME
 LC_TIME
 copy "gez_ET"
 END LC_TIME
-%
diff --git a/localedata/locales/ha_NG b/localedata/locales/ha_NG
index 6ea1a88a4b..0797233d06 100644
--- a/localedata/locales/ha_NG
+++ b/localedata/locales/ha_NG
@@ -305,4 +305,3 @@ country_ab3   "<U004E><U0047><U0041>"
 country_num   566
 
 END LC_ADDRESS
-
diff --git a/localedata/locales/ig_NG b/localedata/locales/ig_NG
index 8b1a48ba85..b74fc4447d 100644
--- a/localedata/locales/ig_NG
+++ b/localedata/locales/ig_NG
@@ -504,4 +504,3 @@ country_ab3   "<U004E><U0047><U0041>"
 country_num   566
 
 END LC_ADDRESS
-
diff --git a/localedata/locales/ik_CA b/localedata/locales/ik_CA
index c08579ce5b..6e0e65442a 100644
--- a/localedata/locales/ik_CA
+++ b/localedata/locales/ik_CA
@@ -242,4 +242,3 @@ lang_term    "<U0069><U0070><U006B>"
 % ipk
 lang_lib    "<U0069><U0070><U006B>"
 END LC_ADDRESS
-
diff --git a/localedata/locales/iu_CA b/localedata/locales/iu_CA
index e2300bf5e4..4f184e57f4 100644
--- a/localedata/locales/iu_CA
+++ b/localedata/locales/iu_CA
@@ -136,6 +136,3 @@ LC_MEASUREMENT
 % metric
 measurement 1
 END LC_MEASUREMENT
-
-
-
diff --git a/localedata/locales/nso_ZA b/localedata/locales/nso_ZA
index df8eb75b4d..fd13354770 100644
--- a/localedata/locales/nso_ZA
+++ b/localedata/locales/nso_ZA
@@ -280,4 +280,3 @@ country_ab3   "<U005A><U0041><U0046>"
 country_num   710
 
 END LC_ADDRESS
-
diff --git a/localedata/locales/om_ET b/localedata/locales/om_ET
index b46544a6db..f9c710b195 100644
--- a/localedata/locales/om_ET
+++ b/localedata/locales/om_ET
@@ -236,4 +236,3 @@ date_fmt    "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0065><U00
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/om_KE b/localedata/locales/om_KE
index eaa189e63d..5387e4e8f2 100644
--- a/localedata/locales/om_KE
+++ b/localedata/locales/om_KE
@@ -332,4 +332,3 @@ date_fmt    "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0065><U00
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/ps_AF b/localedata/locales/ps_AF
index 858c50d7cc..17bef282bb 100644
--- a/localedata/locales/ps_AF
+++ b/localedata/locales/ps_AF
@@ -278,5 +278,3 @@ LC_TELEPHONE
 	int_select	"<U0030><U0030>"
 	int_prefix	"<U0039><U0033>"
 END LC_TELEPHONE
-
-%%%%%%%%%%%%%%%%%%%% locale definition file "ps_AF" ends %%%%%%%%%%%%%%%%%%%%%
diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO
index 610f071c7d..07004d643a 100644
--- a/localedata/locales/ro_RO
+++ b/localedata/locales/ro_RO
@@ -388,4 +388,3 @@ lang_term "<U0072><U006F><U006E>"
 % set the bibliographic code to "rum" as defined in iso639-2
 lang_lib "<U0072><U0075><U006D>"
 END LC_ADDRESS
-
diff --git a/localedata/locales/sid_ET b/localedata/locales/sid_ET
index 86ba9e1b74..6cda039a0b 100644
--- a/localedata/locales/sid_ET
+++ b/localedata/locales/sid_ET
@@ -225,4 +225,3 @@ d_t_fmt    "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0065><U002
 date_fmt    "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0065><U002C>/
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>"
 END LC_TIME
-%
diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ
index c8aab1d562..3e0127b009 100644
--- a/localedata/locales/so_DJ
+++ b/localedata/locales/so_DJ
@@ -224,4 +224,3 @@ date_fmt    "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/so_ET b/localedata/locales/so_ET
index e4a5adcacf..1d1f3ea652 100644
--- a/localedata/locales/so_ET
+++ b/localedata/locales/so_ET
@@ -222,4 +222,3 @@ date_fmt    "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0065><U00
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/so_KE b/localedata/locales/so_KE
index fb8f8e6acf..14555ae42c 100644
--- a/localedata/locales/so_KE
+++ b/localedata/locales/so_KE
@@ -221,4 +221,3 @@ date_fmt    "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0065><U00
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/so_SO b/localedata/locales/so_SO
index 88d3495f97..0c750cbe61 100644
--- a/localedata/locales/so_SO
+++ b/localedata/locales/so_SO
@@ -277,4 +277,3 @@ date_fmt    "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0065><U00
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/ti_ER b/localedata/locales/ti_ER
index 570130baa5..a7ddbada17 100644
--- a/localedata/locales/ti_ER
+++ b/localedata/locales/ti_ER
@@ -269,4 +269,3 @@ date_fmt    "<U0025><U0041><U1361><U0020><U0025><U0042><U0020><U0025><U0065>/
 <U0020><U12D3><U002F><U121D>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET
index cdb6b0a0ac..e2c344684a 100644
--- a/localedata/locales/ti_ET
+++ b/localedata/locales/ti_ET
@@ -1071,4 +1071,3 @@ date_fmt    "<U0025><U0041><U1363><U0020><U0025><U0042><U0020><U0025><U0065>/
 <U0020><U12D3><U002F><U121D>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/tig_ER b/localedata/locales/tig_ER
index cf4b6650d3..d300f877c6 100644
--- a/localedata/locales/tig_ER
+++ b/localedata/locales/tig_ER
@@ -221,4 +221,3 @@ date_fmt    "<U0025><U0041><U1361><U0020><U0025><U0042><U0020><U0025><U0065>/
 <U0020><U12D3><U002F><U121D>"
 %
 END LC_TIME
-%
diff --git a/localedata/locales/wal_ET b/localedata/locales/wal_ET
index 5764267d45..9e21397cc7 100644
--- a/localedata/locales/wal_ET
+++ b/localedata/locales/wal_ET
@@ -232,4 +232,3 @@ date_fmt    "<U0025><U0041><U1363><U0020><U0025><U0042><U0020><U0025><U0065>/
 <U0020><U0025><U0072><U0020><U0025><U005A><U0020><U0025><U0059>/
 <U0020><U130D><U002F><U120B>"
 END LC_TIME
-%
diff --git a/localedata/locales/wo_SN b/localedata/locales/wo_SN
index 8e09d7a5d6..b31679fcd6 100644
--- a/localedata/locales/wo_SN
+++ b/localedata/locales/wo_SN
@@ -186,4 +186,3 @@ lang_term    "<U0077><U006F><U006C>"
 % wol
 lang_lib    "<U0077><U006F><U006C>"
 END LC_ADDRESS
-
diff --git a/localedata/locales/yo_NG b/localedata/locales/yo_NG
index c88ca6e1bd..c8ff82e9d8 100644
--- a/localedata/locales/yo_NG
+++ b/localedata/locales/yo_NG
@@ -509,4 +509,3 @@ country_ab3   "<U004E><U0047><U0041>"
 country_num   566
 
 END LC_ADDRESS
-