diff --git a/ChangeLog b/ChangeLog
index 4ec518197b..f6da7d0ae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-08  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #9706]
+	* nss/nss_files/files-parse.c (strtou32): New function.
+	(INT_FIELD): Use strotu32 instead of strtoul to unify behavior
+	across 32-bit and 64-bit platforms.
+	(INT_FIELD_MAYBE_NULL): Likewise.
+
 2009-01-08  Jakub Jelinek  <jakub@redhat.com>
 
 	[BZ #9720]
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 190575a97c..22e68ce3fe 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -3,6 +3,9 @@
 	[BZ #9701]
 	* locales/sk_SK: Slovakia uses the Euro.
 
+	[BZ #9704]
+	* locales/mt_MT: Malta uses the Euro.
+
 	[BZ #9705]
 	* locales/el_CY: Cyprus uses the Euro.
 
diff --git a/localedata/locales/mt_MT b/localedata/locales/mt_MT
index a882de478a..81c134fde1 100644
--- a/localedata/locales/mt_MT
+++ b/localedata/locales/mt_MT
@@ -131,8 +131,8 @@ LC_MONETARY
 % These are generated based on XML base Locale defintion file
 % for IBM Class for Unicode.
 %
-int_curr_symbol       "<U004D><U0054><U004C><U0020>"
-currency_symbol       "<U004C><U006D>"
+int_curr_symbol       "<U0045><U0055><U0052><U0020>"
+currency_symbol       "<U20AC>"
 mon_decimal_point     "<U002E>"
 mon_thousands_sep     "<U002C>"
 mon_grouping          3
@@ -140,9 +140,9 @@ positive_sign         ""
 negative_sign         "<U002D>"
 int_frac_digits       2
 frac_digits           2
-p_cs_precedes         1
+p_cs_precedes         0
 p_sep_by_space        0
-n_cs_precedes         1
+n_cs_precedes         0
 n_sep_by_space        0
 p_sign_posn           1
 n_sign_posn           0