diff --git a/ChangeLog b/ChangeLog
index 9bb579af3..688cda248 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-22  Owen Taylor  <otaylor@redhat.com>
+
+	* autogen.sh: Set LC_ALL=C rather than LANG and LC_NUMERIC to be
+	robust against whatever settings the user has. (Martin Dobias)
+
 2005-08-21  Billy Biggs  <vektor@dumbterm.net>
 
 	* src/cairo.c: (cairo_paint_with_alpha): Optimize away calls to
diff --git a/autogen.sh b/autogen.sh
index bd6f49da2..88ad4f74b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,9 +17,10 @@ aclocal_min_vers=$automake_min_vers
 autoconf_min_vers=2.54
 libtoolize_min_vers=1.4
 
-# The awk-based string->number conversion we use needs a C locale to work as expected.
-LANG=C
-LC_NUMERIC=C
+# The awk-based string->number conversion we use needs a C locale to work 
+# as expected. Setting LC_ALL overrides whether the user set LC_ALL,
+# LC_NUMERIC, or LANG.
+LC_ALL=C
 
 ARGV0=$0