diff --git a/ChangeLog b/ChangeLog
index 81f1c792f..0d24ec251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-16  Felix Zielcke  <fzielcke@z-51.de>
+
+	* gendistlist.sh (EXTRA_DISTFILES): Remove gensymlist.sh,
+	genkernsyms.sh.  Add geninit.sh, geninitheader.sh, genkernsyms.sh.in,
+	genmoddep.awk, gensymlist.sh.in
+	(DISTDIRS): Add bus, docs, hook, lib
+	* DISTLIST: Regenerated.
+	* NEWS: Add cygwin support and change `os-prober' entry a bit.
+
 2008-08-16  Robert Millan  <rmh@aybabtu.com>
 
 	* disk/raid.c (grub_raid_init): Handle/report errors set by
diff --git a/DISTLIST b/DISTLIST
index 7039b3742..9bf9045b9 100644
--- a/DISTLIST
+++ b/DISTLIST
@@ -1,29 +1,52 @@
-aclocal.m4
 AUTHORS
+COPYING
+ChangeLog
+DISTLIST
+INSTALL
+NEWS
+README
+THANKS
+TODO
+Makefile.in
+aclocal.m4
 autogen.sh
+config.guess
+config.h.in
+config.sub
+configure
+configure.ac
+gencmdlist.sh
+gendistlist.sh
+genfslist.sh
+geninit.sh
+geninitheader.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
-ChangeLog
 commands/blocklist.c
 commands/boot.c
 commands/cat.c
 commands/cmp.c
 commands/configfile.c
+commands/crc.c
+commands/date.c
 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/loadenv.c
 commands/ls.c
 commands/lspci.c
 commands/read.c
@@ -33,42 +56,43 @@ 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/pxecmd.c
+commands/i386/pc/vbeinfo.c
+commands/i386/pc/vbetest.c
+commands/ieee1275/suspend.c
 conf/common.mk
 conf/common.rmk
 conf/i386-coreboot.mk
 conf/i386-coreboot.rmk
 conf/i386-efi.mk
 conf/i386-efi.rmk
+conf/i386-ieee1275.mk
+conf/i386-ieee1275.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
+conf/x86_64-efi.mk
+conf/x86_64-efi.rmk
 disk/ata.c
-disk/efi/efidisk.c
+disk/fs_uuid.c
 disk/host.c
-disk/i386/pc/biosdisk.c
-disk/ieee1275/nand.c
-disk/ieee1275/ofdisk.c
 disk/loopback.c
 disk/lvm.c
 disk/memdisk.c
 disk/raid.c
-DISTLIST
-docs/fdl.texi
-docs/grub.cfg
-docs/grub.texi
-docs/mdate-sh
-docs/texinfo.tex
+disk/efi/efidisk.c
+disk/i386/pc/biosdisk.c
+disk/ieee1275/nand.c
+disk/ieee1275/ofdisk.c
 font/manager.c
 fs/affs.c
+fs/afs.c
 fs/cpio.c
 fs/ext2.c
 fs/fat.c
@@ -82,36 +106,24 @@ fs/ntfs.c
 fs/ntfscomp.c
 fs/reiserfs.c
 fs/sfs.c
+fs/udf.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
+fs/i386/pc/pxe.c
 hello/hello.c
+hook/datehook.c
+include/multiboot.h
+include/multiboot2.h
 include/grub/acorn_filecore.h
+include/grub/aout.h
 include/grub/arg.h
 include/grub/bitmap.h
 include/grub/boot.h
+include/grub/bufio.h
 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
@@ -122,29 +134,78 @@ include/grub/fs.h
 include/grub/fshelp.h
 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/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/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/time.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/efi/uga_draw.h
 include/grub/i386/at_keyboard.h
+include/grub/i386/bsd.h
+include/grub/i386/cmos.h
+include/grub/i386/halt.h
+include/grub/i386/io.h
+include/grub/i386/kernel.h
+include/grub/i386/linux.h
+include/grub/i386/loader.h
+include/grub/i386/pci.h
+include/grub/i386/pit.h
+include/grub/i386/reboot.h
+include/grub/i386/setjmp.h
+include/grub/i386/time.h
+include/grub/i386/tsc.h
+include/grub/i386/types.h
 include/grub/i386/coreboot/boot.h
 include/grub/i386/coreboot/console.h
 include/grub/i386/coreboot/init.h
 include/grub/i386/coreboot/kernel.h
 include/grub/i386/coreboot/loader.h
+include/grub/i386/coreboot/machine.h
 include/grub/i386/coreboot/memory.h
 include/grub/i386/coreboot/serial.h
 include/grub/i386/coreboot/time.h
 include/grub/i386/efi/kernel.h
 include/grub/i386/efi/loader.h
+include/grub/i386/efi/machine.h
 include/grub/i386/efi/time.h
-include/grub/i386/halt.h
+include/grub/i386/ieee1275/console.h
+include/grub/i386/ieee1275/ieee1275.h
+include/grub/i386/ieee1275/kernel.h
 include/grub/i386/ieee1275/loader.h
 include/grub/i386/ieee1275/machine.h
 include/grub/i386/ieee1275/memory.h
 include/grub/i386/ieee1275/serial.h
-include/grub/i386/io.h
-include/grub/i386/kernel.h
-include/grub/i386/linux.h
-include/grub/i386/loader.h
+include/grub/i386/ieee1275/time.h
 include/grub/i386/pc/biosdisk.h
 include/grub/i386/pc/boot.h
 include/grub/i386/pc/chainloader.h
@@ -154,123 +215,136 @@ include/grub/i386/pc/kernel.h
 include/grub/i386/pc/loader.h
 include/grub/i386/pc/machine.h
 include/grub/i386/pc/memory.h
-include/grub/i386/pc/pci.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/i386/pit.h
-include/grub/i386/reboot.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/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
-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/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
 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/powerpc/ieee1275/biosdisk.h
+include/grub/powerpc/ieee1275/console.h
+include/grub/powerpc/ieee1275/ieee1275.h
+include/grub/powerpc/ieee1275/kernel.h
+include/grub/powerpc/ieee1275/loader.h
+include/grub/powerpc/ieee1275/machine.h
+include/grub/powerpc/ieee1275/time.h
+include/grub/powerpc/ieee1275/util/biosdisk.h
+include/grub/sparc64/libgcc.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/sparc64/ieee1275/console.h
+include/grub/sparc64/ieee1275/ieee1275.h
+include/grub/sparc64/ieee1275/kernel.h
+include/grub/sparc64/ieee1275/machine.h
+include/grub/sparc64/ieee1275/time.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
+include/grub/x86_64/linux.h
+include/grub/x86_64/pci.h
+include/grub/x86_64/setjmp.h
+include/grub/x86_64/time.h
+include/grub/x86_64/types.h
+include/grub/x86_64/efi/kernel.h
+include/grub/x86_64/efi/loader.h
+include/grub/x86_64/efi/machine.h
+include/grub/x86_64/efi/time.h
+io/bufio.c
 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/coreboot/init.c
-kern/i386/coreboot/mmap.c
-kern/i386/coreboot/startup.S
-kern/i386/dl.c
-kern/i386/efi/init.c
-kern/i386/efi/startup.S
-kern/i386/halt.c
-kern/i386/loader.S
-kern/i386/pc/init.c
-kern/i386/pc/lzo1x.S
-kern/i386/pc/startup.S
-kern/i386/pit.c
-kern/i386/realmode.S
-kern/i386/reboot.c
-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/time.c
+kern/efi/efi.c
+kern/efi/init.c
+kern/efi/mm.c
+kern/generic/millisleep.c
+kern/generic/rtc_get_time_ms.c
+kern/i386/dl.c
+kern/i386/halt.c
+kern/i386/loader.S
+kern/i386/pit.c
+kern/i386/realmode.S
+kern/i386/reboot.c
+kern/i386/tsc.c
+kern/i386/coreboot/init.c
+kern/i386/coreboot/mmap.c
+kern/i386/coreboot/startup.S
+kern/i386/efi/init.c
+kern/i386/efi/startup.S
+kern/i386/ieee1275/init.c
+kern/i386/ieee1275/startup.S
+kern/i386/pc/init.c
+kern/i386/pc/lzma_decode.S
+kern/i386/pc/lzo1x.S
+kern/i386/pc/startup.S
+kern/ieee1275/cmain.c
+kern/ieee1275/ieee1275.c
+kern/ieee1275/init.c
+kern/ieee1275/openfw.c
 kern/powerpc/cache.S
 kern/powerpc/dl.c
 kern/powerpc/ieee1275/crt0.S
-kern/rescue.c
 kern/sparc64/cache.S
 kern/sparc64/dl.c
 kern/sparc64/ieee1275/init.c
 kern/sparc64/ieee1275/openfw.c
-kern/term.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/efi/datetime.c
+lib/i386/datetime.c
+loader/aout.c
+loader/multiboot2.c
+loader/multiboot_loader.c
+loader/multiboot_loader_normal.c
+loader/efi/appleloader.c
 loader/efi/chainloader.c
 loader/efi/chainloader_normal.c
+loader/i386/bsd.c
+loader/i386/bsd_normal.c
 loader/i386/efi/linux.c
 loader/i386/efi/linux_normal.c
 loader/i386/ieee1275/linux.c
@@ -279,18 +353,12 @@ 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/multiboot2.c
 loader/i386/pc/multiboot_normal.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
-Makefile.in
-mkinstalldirs
-NEWS
 normal/arg.c
 normal/cmdline.c
 normal/color.c
@@ -298,25 +366,26 @@ 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/powerpc/setjmp.S
 normal/script.c
+normal/i386/setjmp.S
+normal/powerpc/setjmp.S
+normal/sparc64/setjmp.S
+normal/x86_64/setjmp.S
 partmap/acorn.c
 partmap/amiga.c
 partmap/apple.c
 partmap/gpt.c
 partmap/pc.c
 partmap/sun.c
-README
-stamp-h.in
-term/efi/console.c
 term/gfxterm.c
+term/terminfo.c
+term/tparm.c
+term/efi/console.c
 term/i386/pc/at_keyboard.c
 term/i386/pc/console.c
 term/i386/pc/serial.c
@@ -324,28 +393,34 @@ 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/genmoddep.c
 util/getroot.c
+util/grub-editenv.c
+util/grub-emu.c
+util/grub-fstest.c
+util/grub-mkdevicemap.c
+util/grub-pe2elf.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/elf/grub-mkimage.c
 util/grub.d/00_header.in
 util/grub.d/10_hurd.in
 util/grub.d/10_linux.in
 util/grub.d/10_windows.in
 util/grub.d/30_os-prober.in
 util/grub.d/40_custom.in
-util/grub.d/README
-util/grub-emu.c
-util/grub-mkdevicemap.c
-util/grub-probe.c
-util/hostfs.c
+util/i386/get_disk_name.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
@@ -353,21 +428,14 @@ util/i386/pc/grub-setup.c
 util/i386/pc/misc.c
 util/ieee1275/get_disk_name.c
 util/ieee1275/grub-install.in
-util/lvm.c
-util/misc.c
 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/i386/pc/vbeblit.c
+video/video.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
 video/readers/png.c
 video/readers/tga.c
-video/video.c
diff --git a/gendistlist.sh b/gendistlist.sh
index 4c648aa90..fdd5d4a66 100644
--- a/gendistlist.sh
+++ b/gendistlist.sh
@@ -16,11 +16,12 @@
 EXTRA_DISTFILES="AUTHORS COPYING ChangeLog DISTLIST INSTALL NEWS README \
 	THANKS TODO Makefile.in aclocal.m4 autogen.sh config.guess \
 	config.h.in config.sub configure configure.ac gencmdlist.sh \
-	gendistlist.sh genfslist.sh genpartmaplist.sh genkernsyms.sh genmk.rb \
-	genmodsrc.sh gensymlist.sh install-sh mkinstalldirs stamp-h.in"
+	gendistlist.sh genfslist.sh geninit.sh geninitheader.sh genkernsyms.sh.in \
+	genmk.rb genmoddep.awk genmodsrc.sh genpartmaplist.sh gensymlist.sh.in
+	install-sh mkinstalldirs stamp-h.in"
 
-DISTDIRS="boot commands conf disk font fs hello include io kern loader \
-	normal partmap term util video"
+DISTDIRS="boot bus commands conf disk docs font fs hello hook include io kern lib \
+	loader normal partmap term util video"
 
 for f in $EXTRA_DISTFILES; do
     echo $f