diff --git a/.gitignore b/.gitignore
index 80fb0c1da..65356fb68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,44 @@
 #
 # Ignore patterns in this directory and all subdirectories.
 #
+*.1
+*.8
+*.a
+*.exec
+*.exec.exe
+*.image
+*.image.exe
+*.img
+*.log
+*.lst
+*.marker
+*.mod
+*.o
+*.pf2
+*.pp
+*.trs
 *~
+.deps
+.deps-core
+.deps-util
+.dirstamp
 00_header
 10_*
 20_linux_xen
 30_os-prober
 40_custom
 41_custom
-*.1
-*.8
 ABOUT-NLS
+DISTLIST
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+INSTALL.grub
+Makefile
+Makefile.in
+Makefile.util.am
+Makefile.utilgcry.def
 aclocal.m4
 ahci_test
 ascii.bitmaps
@@ -22,23 +50,23 @@ build-grub-gen-widthspec
 build-grub-mkfont
 cdboot_test
 cmp_test
+compile
+config-util.h
+config-util.h.in
 config.cache
 config.guess
 config.h
-config-util.h
-config-util.h.in
 config.log
 config.status
 config.sub
 configure
+contrib
 core_compress_test
-DISTLIST
+depcomp
 ehci_test
 example_grub_script_test
 example_scripted_test
 example_unit_test
-*.exec
-*.exec.exe
 fddboot_test
 genkernsyms.sh
 gensymlist.sh
@@ -46,34 +74,43 @@ gentrigtables
 gentrigtables.exe
 gettext_strings_test
 grub-bin2h
-grub_cmd_date
-grub_cmd_echo
-grub_cmd_regexp
-grub_cmd_set_date
-grub_cmd_sleep
 grub-emu
 grub-emu-lite
-grub-emu.exe
 grub-emu-lite.exe
-grub_emu_init.c
-grub_emu_init.h
+grub-emu.exe
 grub-fstest
 grub-fstest.exe
-grub_fstest_init.c
-grub_fstest_init.h
-grub_func_test
 grub-install
 grub-install.exe
 grub-kbdcomp
 grub-macho2img
 grub-mount
+grub-script-check
+grub-script-check.exe
+grub-set-default
+grub-shell
+grub-shell-tester
+grub-sparc64-setup
+grub-sparc64-setup.exe
+grub_cmd_date
+grub_cmd_echo
+grub_cmd_regexp
+grub_cmd_set_date
+grub_cmd_sleep
+grub_emu_init.c
+grub_emu_init.h
+grub_fstest_init.c
+grub_fstest_init.h
+grub_func_test
 grub_probe_init.c
 grub_probe_init.h
+grub_script.tab.c
+grub_script.tab.h
+grub_script.yy.c
+grub_script.yy.h
 grub_script_blanklines
 grub_script_blockarg
 grub_script_break
-grub-script-check
-grub-script-check.exe
 grub_script_check_init.c
 grub_script_check_init.h
 grub_script_comments
@@ -99,88 +136,77 @@ grub_script_strcmp
 grub_script_test
 grub_script_vars1
 grub_script_while1
-grub_script.tab.c
-grub_script.tab.h
-grub_script.yy.c
-grub_script.yy.h
-grub-set-default
 grub_setup_init.c
 grub_setup_init.h
-grub-shell
-grub-shell-tester
-grub-sparc64-setup
-grub-sparc64-setup.exe
 gzcompress_test
 hddboot_test
 help_test
-*.img
-*.image
-*.image.exe
-INSTALL.grub
 install-sh
 libgrub_a_init.c
-*.log
-*.lst
 lzocompress_test
-*.marker
-Makefile
-*.mod
-mod-*.c
+mdate-sh
 missing
+mod-*.c
 netboot_test
-*.o
-*.a
 ohci_test
 partmap_test
 pata_test
-*.pf2
-*.pp
 printf_test
 priority_queue_unit_test
 pseries_test
 stamp-h
-stamp-h1
 stamp-h.in
+stamp-h1
 symlist.c
 symlist.h
-trigtables.c
-*.trs
-uhci_test
-update-grub_lib
-unidata.c
-xzcompress_test
-Makefile.in
-GPATH
-GRTAGS
-GSYMS
-GTAGS
-compile
-depcomp
-mdate-sh
 texinfo.tex
-.deps
-.deps-util
-.deps-core
-.dirstamp
-Makefile.util.am
-contrib
+trigtables.c
+uhci_test
+unidata.c
+update-grub_lib
 widthspec.bin
 widthspec.h
-Makefile.utilgcry.def
+xzcompress_test
 
 #
 # Ignore patterns relative to this .gitignore file's directory.
 #
 /docs/*.info
+/docs/stamp-1
 /docs/stamp-vti
+/docs/version-dev.texi
 /docs/version.texi
+/garbage-gen
+/garbage-gen.exe
 /gnulib
 /grub-bios-setup
 /grub-bios-setup.exe
+/grub-core/*.module
+/grub-core/*.module.exe
+/grub-core/*.pp
+/grub-core/Makefile.core.am
+/grub-core/Makefile.gcry.def
+/grub-core/bootinfo.txt
+/grub-core/build-grub-module-verifier
+/grub-core/build-grub-pe2elf.exe
+/grub-core/contrib
+/grub-core/gdb_grub
+/grub-core/genmod.sh
+/grub-core/gensyminfo.sh
+/grub-core/gmodule.pl
+/grub-core/grub.chrp
+/grub-core/kernel.img.bin
+/grub-core/lib/gnulib
+/grub-core/lib/libgcrypt-grub
+/grub-core/modinfo.sh
+/grub-core/rs_decoder.h
 /grub-editenv
 /grub-editenv.exe
 /grub-file
 /grub-file.exe
+/grub-fs-tester
+/grub-glue-efi
+/grub-glue-efi.exe
 /grub-macbless
 /grub-macbless.exe
 /grub-menulst2cfg
@@ -188,57 +214,31 @@ Makefile.utilgcry.def
 /grub-mk*
 /grub-ofpathname
 /grub-ofpathname.exe
-/grub-core/build-grub-pe2elf.exe
 /grub-probe
 /grub-probe.exe
 /grub-reboot
+/grub-render-label
+/grub-render-label.exe
 /grub-syslinux2cfg
 /grub-syslinux2cfg.exe
 /include/grub/cpu
+/include/grub/gcrypt/g10lib.h
+/include/grub/gcrypt/gcrypt.h
 /include/grub/machine
 /lib/libgcrypt-grub
 /m4
+/po/*.gmo
 /po/*.mo
-/po/grub.pot
+/po/*.po
+/po/LINGUAS
 /po/Makefile.in.in
 /po/Makevars
 /po/Makevars.template
 /po/POTFILES
-/po/Rules-quot
-/po/stamp-po
-/grub-core/lib/libgcrypt-grub
-/grub-core/bootinfo.txt
-/grub-core/Makefile.core.am
-/grub-core/Makefile.gcry.def
-/grub-core/contrib
-/grub-core/gdb_grub
-/grub-core/genmod.sh
-/grub-core/gensyminfo.sh
-/grub-core/gmodule.pl
-/grub-core/grub.chrp
-/grub-core/modinfo.sh
-/grub-core/*.module
-/grub-core/*.module.exe
-/grub-core/*.pp
-/grub-core/kernel.img.bin
-/util/bash-completion.d/grub
-/grub-core/lib/gnulib
-/grub-core/rs_decoder.h
-/docs/stamp-1
-/docs/version-dev.texi
-/po/*.po
-/po/*.gmo
-/po/LINGUAS
-/po/remove-potcdate.sed
-/include/grub/gcrypt/gcrypt.h
-/include/grub/gcrypt/g10lib.h
-/po/POTFILES.in
 /po/POTFILES-shell.in
-/grub-glue-efi
-/grub-render-label
-/grub-glue-efi.exe
-/grub-render-label.exe
-/garbage-gen
-/garbage-gen.exe
-/grub-fs-tester
-/grub-core/build-grub-module-verifier
+/po/POTFILES.in
+/po/Rules-quot
+/po/grub.pot
+/po/remove-potcdate.sed
+/po/stamp-po
+/util/bash-completion.d/grub