diff --git a/ChangeLog b/ChangeLog
index 58a9b93d6..529c5532b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-26  Robert Millan  <rmh@aybabtu.com>
+
+	* DISTLIST: Sort (sort -u < DISTLIST | sponge DISTLIST).
+
 2008-04-25  Bean  <bean123ch@gmail.com>
 	
 	* Makefile.in (RMKFILES): Add missing arch i386-ieee1275 and
diff --git a/DISTLIST b/DISTLIST
index 584561a89..105d98bf1 100644
--- a/DISTLIST
+++ b/DISTLIST
@@ -1,42 +1,15 @@
-AUTHORS
-COPYING
-ChangeLog
-DISTLIST
-INSTALL
-NEWS
-README
-THANKS
-TODO
-Makefile.in
 aclocal.m4
+AUTHORS
 autogen.sh
-config.guess
-config.h.in
-config.sub
-configure
-configure.ac
-gencmdlist.sh
-gendistlist.sh
-genfslist.sh
-geninitheader.sh
-geninit.sh
-genkernsyms.sh.in
-genmk.rb
-genmoddep.awk
-genmodsrc.sh
-genpartmaplist.sh
-gensymlist.sh.in
-install-sh
-mkinstalldirs
-stamp-h.in
 boot/i386/pc/boot.S
 boot/i386/pc/cdboot.S
 boot/i386/pc/diskboot.S
 boot/i386/pc/lnxboot.S
 boot/i386/pc/pxeboot.S
 bus/pci.c
-commands/boot.c
+ChangeLog
 commands/blocklist.c
+commands/boot.c
 commands/cat.c
 commands/cmp.c
 commands/configfile.c
@@ -44,6 +17,13 @@ commands/echo.c
 commands/halt.c
 commands/help.c
 commands/hexdump.c
+commands/i386/cpuid.c
+commands/i386/pc/halt.c
+commands/i386/pc/play.c
+commands/i386/pc/reboot.c
+commands/i386/pc/vbeinfo.c
+commands/i386/pc/vbetest.c
+commands/ieee1275/suspend.c
 commands/ls.c
 commands/lspci.c
 commands/read.c
@@ -53,34 +33,34 @@ commands/sleep.c
 commands/terminal.c
 commands/test.c
 commands/videotest.c
-commands/i386/cpuid.c
-commands/i386/pc/halt.c
-commands/i386/pc/play.c
-commands/i386/pc/reboot.c
-commands/i386/pc/vbeinfo.c
-commands/i386/pc/vbetest.c
-commands/ieee1275/suspend.c
 conf/common.mk
 conf/common.rmk
 conf/i386-efi.mk
 conf/i386-efi.rmk
-conf/i386-linuxbios.rmk
 conf/i386-linuxbios.mk
+conf/i386-linuxbios.rmk
 conf/i386-pc.mk
 conf/i386-pc.rmk
+config.guess
+config.h.in
+config.sub
+configure
+configure.ac
 conf/powerpc-ieee1275.mk
 conf/powerpc-ieee1275.rmk
 conf/sparc64-ieee1275.mk
 conf/sparc64-ieee1275.rmk
+COPYING
 disk/ata.c
+disk/efi/efidisk.c
 disk/host.c
+disk/i386/pc/biosdisk.c
+disk/ieee1275/ofdisk.c
 disk/loopback.c
 disk/lvm.c
 disk/memdisk.c
 disk/raid.c
-disk/efi/efidisk.c
-disk/i386/pc/biosdisk.c
-disk/ieee1275/ofdisk.c
+DISTLIST
 docs/fdl.texi
 docs/grub.texi
 docs/mdate-sh
@@ -102,9 +82,18 @@ fs/reiserfs.c
 fs/sfs.c
 fs/ufs.c
 fs/xfs.c
+gencmdlist.sh
+gendistlist.sh
+genfslist.sh
+geninitheader.sh
+geninit.sh
+genkernsyms.sh.in
+genmk.rb
+genmoddep.awk
+genmodsrc.sh
+genpartmaplist.sh
+gensymlist.sh.in
 hello/hello.c
-include/multiboot.h
-include/multiboot2.h
 include/grub/acorn_filecore.h
 include/grub/arg.h
 include/grub/bitmap.h
@@ -113,6 +102,14 @@ include/grub/cache.h
 include/grub/device.h
 include/grub/disk.h
 include/grub/dl.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/disk.h
+include/grub/efi/efi.h
+include/grub/efi/pe32.h
+include/grub/efi/time.h
 include/grub/elf.h
 include/grub/elfload.h
 include/grub/env.h
@@ -125,44 +122,6 @@ include/grub/gpt_partition.h
 include/grub/gzio.h
 include/grub/hexdump.h
 include/grub/hfs.h
-include/grub/kernel.h
-include/grub/loader.h
-include/grub/lvm.h
-include/grub/misc.h
-include/grub/mm.h
-include/grub/multiboot.h
-include/grub/multiboot_loader.h
-include/grub/multiboot2.h
-include/grub/net.h
-include/grub/normal.h
-include/grub/ntfs.h
-include/grub/parser.h
-include/grub/partition.h
-include/grub/pc_partition.h
-include/grub/pci.h
-include/grub/raid.h
-include/grub/rescue.h
-include/grub/script.h
-include/grub/setjmp.h
-include/grub/symbol.h
-include/grub/term.h
-include/grub/terminfo.h
-include/grub/tparm.h
-include/grub/types.h
-include/grub/video.h
-include/grub/efi/api.h
-include/grub/efi/chainloader.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
-include/grub/efi/time.h
-include/grub/i386/linux.h
-include/grub/i386/loader.h
-include/grub/i386/setjmp.h
-include/grub/i386/time.h
-include/grub/i386/types.h
 include/grub/i386/efi/kernel.h
 include/grub/i386/efi/loader.h
 include/grub/i386/efi/time.h
@@ -179,6 +138,8 @@ include/grub/i386/linuxbios/loader.h
 include/grub/i386/linuxbios/memory.h
 include/grub/i386/linuxbios/serial.h
 include/grub/i386/linuxbios/time.h
+include/grub/i386/linux.h
+include/grub/i386/loader.h
 include/grub/i386/pc/biosdisk.h
 include/grub/i386/pc/boot.h
 include/grub/i386/pc/chainloader.h
@@ -191,17 +152,31 @@ include/grub/i386/pc/memory.h
 include/grub/i386/pc/pci.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/i386/setjmp.h
+include/grub/i386/time.h
+include/grub/i386/types.h
 include/grub/ieee1275/ieee1275.h
 include/grub/ieee1275/ofdisk.h
-include/grub/powerpc/libgcc.h
-include/grub/powerpc/setjmp.h
-include/grub/powerpc/time.h
-include/grub/powerpc/types.h
+include/grub/kernel.h
+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/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/powerpc/ieee1275/biosdisk.h
 include/grub/powerpc/ieee1275/console.h
 include/grub/powerpc/ieee1275/ieee1275.h
@@ -209,68 +184,80 @@ include/grub/powerpc/ieee1275/kernel.h
 include/grub/powerpc/ieee1275/loader.h
 include/grub/powerpc/ieee1275/time.h
 include/grub/powerpc/ieee1275/util/biosdisk.h
-include/grub/sparc64/setjmp.h
-include/grub/sparc64/time.h
-include/grub/sparc64/types.h
+include/grub/powerpc/libgcc.h
+include/grub/powerpc/setjmp.h
+include/grub/powerpc/time.h
+include/grub/powerpc/types.h
+include/grub/raid.h
+include/grub/rescue.h
+include/grub/script.h
+include/grub/setjmp.h
 include/grub/sparc64/ieee1275/console.h
 include/grub/sparc64/ieee1275/ieee1275.h
 include/grub/sparc64/ieee1275/kernel.h
 include/grub/sparc64/ieee1275/time.h
+include/grub/sparc64/setjmp.h
+include/grub/sparc64/time.h
+include/grub/sparc64/types.h
+include/grub/symbol.h
+include/grub/term.h
+include/grub/terminfo.h
 include/grub/time.h
+include/grub/tparm.h
+include/grub/types.h
 include/grub/util/biosdisk.h
 include/grub/util/getroot.h
 include/grub/util/lvm.h
 include/grub/util/misc.h
 include/grub/util/raid.h
 include/grub/util/resolve.h
+include/grub/video.h
+include/multiboot2.h
+include/multiboot.h
+INSTALL
+install-sh
 io/gzio.c
 kern/device.c
 kern/disk.c
 kern/dl.c
+kern/efi/efi.c
+kern/efi/init.c
+kern/efi/mm.c
 kern/elf.c
 kern/env.c
 kern/err.c
 kern/file.c
 kern/fs.c
+kern/i386/dl.c
+kern/i386/efi/init.c
+kern/i386/efi/startup.S
+kern/i386/linuxbios/init.c
+kern/i386/linuxbios/startup.S
+kern/i386/linuxbios/table.c
+kern/i386/loader.S
+kern/i386/pc/init.c
+kern/i386/pc/lzo1x.S
+kern/i386/pc/startup.S
+kern/i386/realmode.S
+kern/ieee1275/cmain.c
+kern/ieee1275/ieee1275.c
+kern/ieee1275/init.c
+kern/ieee1275/openfw.c
 kern/loader.c
 kern/main.c
 kern/misc.c
 kern/mm.c
 kern/parser.c
 kern/partition.c
-kern/rescue.c
-kern/term.c
-kern/efi/init.c
-kern/efi/efi.c
-kern/efi/mm.c
-kern/i386/dl.c
-kern/i386/efi/init.c
-kern/i386/efi/startup.S
-kern/i386/loader.S
-kern/i386/linuxbios/init.c
-kern/i386/linuxbios/startup.S
-kern/i386/linuxbios/table.c
-term/i386/pc/at_keyboard.c
-kern/i386/pc/init.c
-kern/i386/pc/lzo1x.S
-kern/i386/pc/startup.S
-term/i386/pc/vga_text.c
-kern/i386/realmode.S
 kern/powerpc/cache.S
 kern/powerpc/dl.c
 kern/powerpc/ieee1275/crt0.S
-kern/ieee1275/ieee1275.c
-kern/ieee1275/cmain.c
-kern/ieee1275/init.c
-kern/ieee1275/openfw.c
-kern/ieee1275/ieee1275.c
+kern/rescue.c
 kern/sparc64/cache.S
 kern/sparc64/dl.c
 kern/sparc64/ieee1275/init.c
 kern/sparc64/ieee1275/openfw.c
-loader/multiboot_loader.c
-loader/multiboot_loader_normal.c
-loader/multiboot2.c
+kern/term.c
 loader/efi/chainloader.c
 loader/efi/chainloader_normal.c
 loader/i386/efi/linux.c
@@ -279,81 +266,93 @@ loader/i386/pc/chainloader.c
 loader/i386/pc/chainloader_normal.c
 loader/i386/pc/linux.c
 loader/i386/pc/linux_normal.c
+loader/i386/pc/multiboot2.c
 loader/i386/pc/multiboot.c
 loader/i386/pc/multiboot_normal.c
-loader/i386/pc/multiboot2.c
+loader/ieee1275/multiboot2.c
+loader/multiboot2.c
+loader/multiboot_loader.c
+loader/multiboot_loader_normal.c
 loader/powerpc/ieee1275/linux.c
 loader/powerpc/ieee1275/linux_normal.c
-loader/ieee1275/multiboot2.c
+Makefile.in
+mkinstalldirs
+NEWS
 normal/arg.c
-normal/color.c
 normal/cmdline.c
+normal/color.c
 normal/command.c
 normal/completion.c
 normal/execute.c
 normal/function.c
+normal/i386/setjmp.S
 normal/lexer.c
 normal/main.c
 normal/menu.c
 normal/menu_entry.c
 normal/misc.c
 normal/parser.y
-normal/script.c
-normal/i386/setjmp.S
 normal/powerpc/setjmp.S
+normal/script.c
 partmap/acorn.c
 partmap/amiga.c
 partmap/apple.c
 partmap/gpt.c
 partmap/pc.c
 partmap/sun.c
-term/terminfo.c
-term/tparm.c
-term/gfxterm.c
+README
+stamp-h.in
 term/efi/console.c
+term/gfxterm.c
+term/i386/pc/at_keyboard.c
 term/i386/pc/console.c
 term/i386/pc/serial.c
 term/i386/pc/vesafb.c
 term/i386/pc/vga.c
+term/i386/pc/vga_text.c
 term/ieee1275/ofconsole.c
+term/terminfo.c
+term/tparm.c
+THANKS
+TODO
 util/biosdisk.c
 util/console.c
+util/elf/grub-mkimage.c
 util/getroot.c
-util/grub-emu.c
-util/grub-mkdevicemap.c
-util/grub-probe.c
-util/hostfs.c
-util/lvm.c
-util/misc.c
-util/raid.c
-util/resolve.c
-util/unifont2pff.rb
-util/update-grub.in
-util/update-grub_lib.in
 util/grub.d/00_header.in
 util/grub.d/10_hurd.in
 util/grub.d/10_linux.in
 util/grub.d/30_os-prober.in
 util/grub.d/README
-util/elf/grub-mkimage.c
+util/grub-emu.c
+util/grub-mkdevicemap.c
+util/grub-probe.c
+util/hostfs.c
 util/i386/efi/grub-install.in
 util/i386/efi/grub-mkimage.c
 util/i386/get_disk_name.c
 util/i386/pc/grub-install.in
 util/i386/pc/grub-mkimage.c
+util/i386/pc/grub-mkrescue.in
 util/i386/pc/grub-setup.c
 util/i386/pc/misc.c
-util/i386/pc/grub-mkrescue.in
 util/ieee1275/get_disk_name.c
+util/lvm.c
+util/misc.c
 util/powerpc/ieee1275/grub-install.in
 util/powerpc/ieee1275/grub-mkrescue.in
 util/powerpc/ieee1275/misc.c
+util/raid.c
+util/resolve.c
+util/unifont2pff.rb
+util/update-grub.in
+util/update-grub_lib.in
 video/bitmap.c
-video/video.c
-video/i386/pc/vbe.c
 video/i386/pc/vbeblit.c
+video/i386/pc/vbe.c
 video/i386/pc/vbefill.c
-video/readers/jpeg.c
-video/readers/tga.c
-video/readers/png.c
 video/i386/pc/vbeutil.c
+video/readers/jpeg.c
+video/readers/png.c
+video/readers/tga.c
+video/video.c