diff --git a/ChangeLog b/ChangeLog
index 56df59395..0f7d4fb6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-11-07  Pavel Roskin  <proski@gnu.org>
 
+	* gendistlist.sh: Use C locale for sorting to ensure consistent
+	output on all systems.
+
 	* util/grub.d/00_header.in: Remove incorrect space before
 	"serial".
 
diff --git a/DISTLIST b/DISTLIST
index b54ba2903..95f28a4d0 100644
--- a/DISTLIST
+++ b/DISTLIST
@@ -71,10 +71,10 @@ conf/i386-efi.mk
 conf/i386-efi.rmk
 conf/i386-ieee1275.mk
 conf/i386-ieee1275.rmk
-conf/i386.mk
 conf/i386-pc-cygwin-img-ld.sc
 conf/i386-pc.mk
 conf/i386-pc.rmk
+conf/i386.mk
 conf/i386.rmk
 conf/powerpc-ieee1275.mk
 conf/powerpc-ieee1275.rmk
@@ -90,9 +90,9 @@ disk/loopback.c
 disk/lvm.c
 disk/mdraid_linux.c
 disk/memdisk.c
+disk/raid.c
 disk/raid5_recover.c
 disk/raid6_recover.c
-disk/raid.c
 disk/scsi.c
 disk/efi/efidisk.c
 disk/i386/pc/biosdisk.c
@@ -124,8 +124,8 @@ fs/xfs.c
 fs/i386/pc/pxe.c
 hello/hello.c
 hook/datehook.c
-include/multiboot2.h
 include/multiboot.h
+include/multiboot2.h
 include/grub/acorn_filecore.h
 include/grub/aout.h
 include/grub/arg.h
@@ -152,21 +152,21 @@ include/grub/loader.h
 include/grub/lvm.h
 include/grub/misc.h
 include/grub/mm.h
-include/grub/multiboot2.h
 include/grub/multiboot.h
+include/grub/multiboot2.h
 include/grub/multiboot_loader.h
 include/grub/net.h
 include/grub/normal.h
 include/grub/ntfs.h
 include/grub/parser.h
 include/grub/partition.h
-include/grub/pci.h
 include/grub/pc_partition.h
+include/grub/pci.h
 include/grub/raid.h
 include/grub/rescue.h
 include/grub/script.h
-include/grub/scsicmd.h
 include/grub/scsi.h
+include/grub/scsicmd.h
 include/grub/setjmp.h
 include/grub/symbol.h
 include/grub/term.h
@@ -177,8 +177,8 @@ include/grub/types.h
 include/grub/video.h
 include/grub/efi/api.h
 include/grub/efi/chainloader.h
-include/grub/efi/console_control.h
 include/grub/efi/console.h
+include/grub/efi/console_control.h
 include/grub/efi/disk.h
 include/grub/efi/efi.h
 include/grub/efi/pe32.h
@@ -232,22 +232,22 @@ include/grub/i386/pc/memory.h
 include/grub/i386/pc/pxe.h
 include/grub/i386/pc/serial.h
 include/grub/i386/pc/time.h
+include/grub/i386/pc/vbe.h
 include/grub/i386/pc/vbeblit.h
 include/grub/i386/pc/vbefill.h
-include/grub/i386/pc/vbe.h
 include/grub/i386/pc/vbeutil.h
 include/grub/i386/pc/vga.h
 include/grub/ieee1275/ieee1275.h
 include/grub/ieee1275/ofdisk.h
-include/grub/lib/crc.h
-include/grub/lib/datetime.h
-include/grub/lib/envblk.h
-include/grub/lib/hexdump.h
 include/grub/lib/LzFind.h
 include/grub/lib/LzHash.h
 include/grub/lib/LzmaDec.h
 include/grub/lib/LzmaEnc.h
 include/grub/lib/LzmaTypes.h
+include/grub/lib/crc.h
+include/grub/lib/datetime.h
+include/grub/lib/envblk.h
+include/grub/lib/hexdump.h
 include/grub/powerpc/kernel.h
 include/grub/powerpc/libgcc.h
 include/grub/powerpc/setjmp.h
@@ -343,13 +343,13 @@ kern/sparc64/ieee1275/openfw.c
 kern/x86_64/dl.c
 kern/x86_64/efi/callwrap.S
 kern/x86_64/efi/startup.S
+lib/LzFind.c
+lib/LzmaDec.c
+lib/LzmaEnc.c
 lib/crc.c
 lib/datetime.c
 lib/envblk.c
 lib/hexdump.c
-lib/LzFind.c
-lib/LzmaDec.c
-lib/LzmaEnc.c
 lib/efi/datetime.c
 lib/i386/datetime.c
 loader/aout.c
@@ -368,8 +368,8 @@ loader/i386/ieee1275/linux.c
 loader/i386/pc/chainloader.c
 loader/i386/pc/chainloader_normal.c
 loader/i386/pc/linux.c
-loader/i386/pc/multiboot2.c
 loader/i386/pc/multiboot.c
+loader/i386/pc/multiboot2.c
 loader/i386/pc/multiboot_normal.c
 loader/ieee1275/multiboot2.c
 loader/powerpc/ieee1275/linux.c
@@ -448,8 +448,8 @@ util/powerpc/ieee1275/grub-mkrescue.in
 util/powerpc/ieee1275/misc.c
 video/bitmap.c
 video/video.c
-video/i386/pc/vbeblit.c
 video/i386/pc/vbe.c
+video/i386/pc/vbeblit.c
 video/i386/pc/vbefill.c
 video/i386/pc/vbeutil.c
 video/readers/jpeg.c
diff --git a/gendistlist.sh b/gendistlist.sh
index 1ce8f1601..286329ab2 100644
--- a/gendistlist.sh
+++ b/gendistlist.sh
@@ -23,6 +23,9 @@ EXTRA_DISTFILES="AUTHORS COPYING ChangeLog DISTLIST INSTALL NEWS README \
 DISTDIRS="boot bus commands conf disk docs font fs hello hook include io kern lib \
 	loader normal partmap term util video"
 
+LC_COLLATE=C
+export LC_COLLATE
+
 for f in $EXTRA_DISTFILES; do
     echo $f
 done