diff --git a/ChangeLog b/ChangeLog
index 7dac2c5ff5..815a5fe112 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-10-31  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #6974]
+	* sunrpc/rpc_main.c (mkfile_output): Properly handle filename
+	without dot.  Properly terminate the string with a null byte.
+	Based on a patch by Aurelien Jarno <aurelien@aurel32.net>.
+
 	[BZ #6980]
 	* debug/getgroups_chk.c (__getgroups_chk): Return EINVAL error for
 	negative sizees.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 9e09641efe..ec693c49e9 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* tests-mbwc/dat_mbtowc.c (tst_mbtowc_loc): Avoid some warnings.
+
+	[BZ #6968]
+	* locales/iso14651_t1_common: Add support for Sinhala.
+	* localedata/si_LK.in: New file.
+	Patch by harshula@gmail.com.
+	* Makefile (test-input): Add si_LK.UTF-8.
+	(LOCALES): Likewise.
+
 2008-09-17  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/en_GB: Set first weekday and workday to 2.
diff --git a/localedata/Makefile b/localedata/Makefile
index 4bb0e32df5..0566792d00 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1996-2003, 2005, 2007, 2008 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -41,7 +41,8 @@ test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
 	     tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
 	     tst-ctype tst-wctype tst-langinfo tst-numeric
 test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
-	      hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8
+	      hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \
+	      si_LK.UTF-8
 test-input-data = $(addsuffix .in, $(basename $(test-input)))
 test-output := $(foreach s, .out .xout, \
 			 $(addsuffix $s, $(basename $(test-input))))
@@ -134,7 +135,7 @@ LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
 	   hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
 	   vi_VN.TCVN5712-1 nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 \
 	   tr_TR.UTF-8 cs_CZ.UTF-8 zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 \
-	   ja_JP.UTF-8
+	   ja_JP.UTF-8 si_LK.UTF-8
 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
 CHARMAPS := $(shell echo "$(LOCALES)" | \
 		    sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g)
diff --git a/localedata/tests-mbwc/dat_mbtowc.c b/localedata/tests-mbwc/dat_mbtowc.c
index 5168ed184d..95edb684d3 100644
--- a/localedata/tests-mbwc/dat_mbtowc.c
+++ b/localedata/tests-mbwc/dat_mbtowc.c
@@ -135,7 +135,7 @@ TST_MBTOWC tst_mbtowc_loc [] = {
 	  {
 	    { 0, 1, "\xfc\xe4\xf6",	MB_LEN_MAX },
 	    { 0, 1, "\177",	   	MB_LEN_MAX },
-	    { 0, 0, (char)NULL, 	MB_LEN_MAX },
+	    { 0, 0, NULL, 		MB_LEN_MAX },
 	  }
 	},
 	{
@@ -221,7 +221,7 @@ TST_MBTOWC tst_mbtowc_loc [] = {
 	  {
 	    { 0, 1, "ABC",	    MB_LEN_MAX },
 	    { 0, 1, "\177",	    MB_LEN_MAX },
-	    { 0, 0, (char)NULL, MB_LEN_MAX },
+	    { 0, 0, NULL,	    MB_LEN_MAX },
 	  }
 	},
 	{
@@ -305,7 +305,7 @@ TST_MBTOWC tst_mbtowc_loc [] = {
 	  {
 	    { 0, 1, "\244\242A",      MB_LEN_MAX },
 	    { 0, 1, "\177\244\242",   MB_LEN_MAX },
-	    { 0, 1, "",         MB_LEN_MAX },
+	    { 0, 1, "",		      MB_LEN_MAX },
 	  }
 	},
 	{
@@ -321,7 +321,7 @@ TST_MBTOWC tst_mbtowc_loc [] = {
 	  {
 	    { 0, 1, "\244\242A",      MB_LEN_MAX },
 	    { 0, 1, "\177\244\242",   MB_LEN_MAX },
-	    { 0, 0, (char)NULL, MB_LEN_MAX },
+	    { 0, 0, NULL,	      MB_LEN_MAX },
 	  }
 	},
 	{