diff --git a/.gitignore b/.gitignore
index 44c789d09..5863cb178 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,162 +22,88 @@
 .deps-util/
 .deps/
 .dirstamp
-00_header
-10_*
-20_linux_xen
-30_os-prober
-40_custom
-41_custom
-ABOUT-NLS
 DISTLIST
 GPATH
 GRTAGS
 GSYMS
 GTAGS
-INSTALL.grub
 Makefile
 Makefile.in
-Makefile.util.am
-Makefile.utilgcry.def
-aclocal.m4
-ahci_test
 ascii.bitmaps
-ascii.h
-autom4te.cache/
-build-aux/
-build-grub-gen-asciih
-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.log
-config.status
-config.sub
-configure
-contrib
-core_compress_test
-depcomp
-ehci_test
-example_grub_script_test
-example_scripted_test
-example_unit_test
-fddboot_test
 genkernsyms.sh
 gensymlist.sh
-gentrigtables
-gentrigtables.exe
-gettext_strings_test
 grub-bin2h
 grub-emu
 grub-emu-lite
 grub-emu-lite.exe
 grub-emu.exe
-grub-fstest
-grub-fstest.exe
-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_init.c
 grub_script_check_init.h
-grub_script_comments
-grub_script_continue
-grub_script_dollar
-grub_script_echo1
-grub_script_echo_keywords
-grub_script_escape_comma
-grub_script_eval
-grub_script_expansion
-grub_script_final_semicolon
-grub_script_for1
-grub_script_functions
-grub_script_gettext
-grub_script_if
-grub_script_leading_whitespace
-grub_script_no_commands
-grub_script_not
-grub_script_return
-grub_script_setparams
-grub_script_shift
-grub_script_strcmp
-grub_script_test
-grub_script_vars1
-grub_script_while1
 grub_setup_init.c
 grub_setup_init.h
-gzcompress_test
-hddboot_test
-help_test
-install-sh
-libgrub_a_init.c
-lzocompress_test
 mdate-sh
-missing
 mod-*.c
-netboot_test
-ohci_test
-partmap_test
-pata_test
-printf_test
-priority_queue_unit_test
-pseries_test
-stamp-h
-stamp-h.in
-stamp-h1
-symlist.c
-symlist.h
-texinfo.tex
-trigtables.c
-uhci_test
-unidata.c
 update-grub_lib
 widthspec.bin
-widthspec.h
-xzcompress_test
 
 #
 # Ignore patterns relative to this .gitignore file's directory.
 #
+/00_header
+/10_*
+/20_linux_xen
+/30_os-prober
+/40_custom
+/41_custom
+/ABOUT-NLS
+/INSTALL.grub
+/Makefile.util.am
+/Makefile.utilgcry.def
+/aclocal.m4
+/ahci_test
+/ascii.h
+/autom4te.cache/
+/build-aux/
+/build-grub-gen-asciih
+/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.log
+/config.status
+/config.sub
+/configure
+/contrib
+/core_compress_test
+/depcomp
 /docs/*.info
 /docs/stamp-1
 /docs/stamp-vti
 /docs/version-dev.texi
 /docs/version.texi
+/ehci_test
+/example_grub_script_test
+/example_scripted_test
+/example_unit_test
+/fddboot_test
 /garbage-gen
 /garbage-gen.exe
+/gettext_strings_test
 /gnulib/
 /grub-bios-setup
 /grub-bios-setup.exe
@@ -193,6 +119,8 @@ xzcompress_test
 /grub-core/gdb_grub
 /grub-core/genmod.sh
 /grub-core/gensyminfo.sh
+/grub-core/gentrigtables
+/grub-core/gentrigtables.exe
 /grub-core/gmodule.pl
 /grub-core/grub.chrp
 /grub-core/kernel.img.bin
@@ -200,18 +128,28 @@ xzcompress_test
 /grub-core/lib/libgcrypt-grub
 /grub-core/modinfo.sh
 /grub-core/rs_decoder.h
+/grub-core/symlist.c
+/grub-core/symlist.h
+/grub-core/trigtables.c
+/grub-core/unidata.c
 /grub-editenv
 /grub-editenv.exe
 /grub-file
 /grub-file.exe
 /grub-fs-tester
+/grub-fstest
+/grub-fstest.exe
 /grub-glue-efi
 /grub-glue-efi.exe
+/grub-install
+/grub-install.exe
+/grub-kbdcomp
 /grub-macbless
 /grub-macbless.exe
 /grub-menulst2cfg
 /grub-menulst2cfg.exe
 /grub-mk*
+/grub-mount
 /grub-ofpathname
 /grub-ofpathname.exe
 /grub-probe
@@ -219,14 +157,67 @@ xzcompress_test
 /grub-reboot
 /grub-render-label
 /grub-render-label.exe
+/grub-script-check
+/grub-script-check.exe
+/grub-set-default
+/grub-shell
+/grub-shell-tester
+/grub-sparc64-setup
+/grub-sparc64-setup.exe
 /grub-syslinux2cfg
 /grub-syslinux2cfg.exe
+/grub_cmd_date
+/grub_cmd_echo
+/grub_cmd_regexp
+/grub_cmd_set_date
+/grub_cmd_sleep
+/grub_fstest_init.c
+/grub_fstest_init.h
+/grub_func_test
+/grub_script_blanklines
+/grub_script_blockarg
+/grub_script_break
+/grub_script_comments
+/grub_script_continue
+/grub_script_dollar
+/grub_script_echo1
+/grub_script_echo_keywords
+/grub_script_escape_comma
+/grub_script_eval
+/grub_script_expansion
+/grub_script_final_semicolon
+/grub_script_for1
+/grub_script_functions
+/grub_script_gettext
+/grub_script_if
+/grub_script_leading_whitespace
+/grub_script_no_commands
+/grub_script_not
+/grub_script_return
+/grub_script_setparams
+/grub_script_shift
+/grub_script_strcmp
+/grub_script_test
+/grub_script_vars1
+/grub_script_while1
+/gzcompress_test
+/hddboot_test
+/help_test
 /include/grub/cpu
 /include/grub/gcrypt/g10lib.h
 /include/grub/gcrypt/gcrypt.h
 /include/grub/machine
+/install-sh
 /lib/libgcrypt-grub
+/libgrub_a_init.c
+/lzocompress_test
 /m4/
+/minixfs_test
+/missing
+/netboot_test
+/ohci_test
+/partmap_test
+/pata_test
 /po/*.gmo
 /po/*.mo
 /po/*.po
@@ -241,4 +232,14 @@ xzcompress_test
 /po/grub.pot
 /po/remove-potcdate.sed
 /po/stamp-po
+/printf_test
+/priority_queue_unit_test
+/pseries_test
+/stamp-h
+/stamp-h.in
+/stamp-h1
+/texinfo.tex
+/uhci_test
 /util/bash-completion.d/grub
+/widthspec.h
+/xzcompress_test