diff --git a/ChangeLog b/ChangeLog
index 26e6e014bb..7c92455662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-12-11  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile ($(inst_includedir)/gnu/stubs.h): Sort in the C locale.
+
+2000-12-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* sunrpc/Makefile (rpcgen-cmd): Use single quotes in sed call.
+	Patch by Ed Connell <Ed.Connell@sas.com>.
+
 2000-12-24  Ulrich Drepper  <drepper@redhat.com>
 
 	* locale/iso-639.def: Correct one entry.  Add two missing entries.
diff --git a/FAQ b/FAQ
index 889fe637e2..696d65715c 100644
--- a/FAQ
+++ b/FAQ
@@ -182,6 +182,7 @@ please let me know.
 4.7.	Why do so many programs using math functions fail on my AlphaStation?
 4.8.	The conversion table for character set XX does not match with
 what I expect.
+4.9.	How can I find out which version of glibc I am using in the moment?
 
 
 ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ 
@@ -1813,6 +1814,30 @@ Before doing this look through the list of known problem first:
   if it cannot directly map a character this is a perfectly good solution
   since the semantics and appearance of the character does not change.
 
+
+4.9.	How can I find out which version of glibc I am using in the moment?
+
+{UD} If you want to find out about the version from the command line simply
+run the libc binary.  This is probably not possible on all platforms but
+where it is simply locate the libc DSO and start it as an application.  On
+Linux like
+
+	/lib/libc.so.6
+
+This will produce all the information you need.
+
+What always will work is to use the API glibc provides.  Compile and run the
+following little program to get the version information:
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#include <stdio.h>
+#include <gnu/libc-version.h>
+int main (void) { puts (gnu_get_libc_version ()); return 0; }
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This interface can also obviously be used to perform tests at runtime if
+this should be necessary.
+
 
 ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ 
 
diff --git a/FAQ.in b/FAQ.in
index 2daeea9b55..51b7d53a86 100644
--- a/FAQ.in
+++ b/FAQ.in
@@ -1560,6 +1560,29 @@ Before doing this look through the list of known problem first:
   if it cannot directly map a character this is a perfectly good solution
   since the semantics and appearance of the character does not change.
 
+??	How can I find out which version of glibc I am using in the moment?
+
+{UD} If you want to find out about the version from the command line simply
+run the libc binary.  This is probably not possible on all platforms but
+where it is simply locate the libc DSO and start it as an application.  On
+Linux like
+
+	/lib/libc.so.6
+
+This will produce all the information you need.
+
+What always will work is to use the API glibc provides.  Compile and run the
+following little program to get the version information:
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#include <stdio.h>
+#include <gnu/libc-version.h>
+int main (void) { puts (gnu_get_libc_version ()); return 0; }
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This interface can also obviously be used to perform tests at runtime if
+this should be necessary.
+
 
 Answers were given by:
 {UD} Ulrich Drepper, <drepper@cygnus.com>
diff --git a/Makefile b/Makefile
index 04a1708351..0160bba819 100644
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,7 @@ $(inst_includedir)/gnu/stubs.h: subdir_install
 	 echo '   It defines a symbol `__stub_FUNCTION'\'' for each function';\
 	 echo '   in the C library which is a stub, meaning it will fail';\
 	 echo '   every time called, usually setting errno to ENOSYS.  */';\
-	 sort $(subdir-stubs)) > $(objpfx)stubs.h
+	 LC_ALL=C sort $(subdir-stubs)) > $(objpfx)stubs.h
 	if test -r $@ && cmp -s $(objpfx)stubs.h $@; \
 	then echo 'stubs.h unchanged'; \
 	else $(INSTALL_DATA) $(objpfx)stubs.h $@; fi
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 1ce03d7d98..cb098a7375 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1994, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+# Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 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
@@ -125,7 +125,7 @@ $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \
 
 # Tell rpcgen where to find the C preprocessor.
 rpcgen-cmd = $(built-program-cmd) -Y `$(CC) -print-file-name=cpp | \
-				      sed "s|/cpp$$||"`
+				      sed 's|/cpp$$||'`
 
 # Install the rpc data base file.
 $(inst_sysconfdir)/rpc: etc.rpc $(+force)