diff --git a/ChangeLog b/ChangeLog
index 7b247ca81..1820e3306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-08  Vladimir Serbinenko  <phcoder@gmail.com>
+2011-04-08  Colin Watson  <cjwatson@ubuntu.com>
+
+	* autogen.sh: Ensure that collate and ctype locale is C.
+	* conf/Makefile.common: Likeiwise.
+
 2011-04-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/menu.c: Add missing include.
diff --git a/autogen.sh b/autogen.sh
index 96b1e33e2..d14707aad 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,6 +2,10 @@
 
 set -e
 
+export LC_CTYPE=C
+export LC_COLLATE=C
+unset LC_ALL
+
 autogen --version >/dev/null || exit 1
 
 echo "Importing unicode..."
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 32ca76d08..5aa13cdd6 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -2,6 +2,10 @@
 
 CFLAGS_PLATFORM=
 
+export LC_COLLATE := C
+export LC_CTYPE := C
+unexport LC_ALL
+
 # Platform specific options
 if COND_i386_pc
   CFLAGS_PLATFORM += -mrtd -mregparm=3