diff --git a/.gitignore b/.gitignore
index 8908a2131..80fb0c1da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+#
+# Ignore patterns in this directory and all subdirectories.
+#
 *~
 00_header
 10_*
@@ -30,9 +33,6 @@ config.sub
 configure
 core_compress_test
 DISTLIST
-/docs/*.info
-/docs/stamp-vti
-/docs/version.texi
 ehci_test
 example_grub_script_test
 example_scripted_test
@@ -45,25 +45,18 @@ gensymlist.sh
 gentrigtables
 gentrigtables.exe
 gettext_strings_test
-/gnulib
 grub-bin2h
-/grub-bios-setup
-/grub-bios-setup.exe
 grub_cmd_date
 grub_cmd_echo
 grub_cmd_regexp
 grub_cmd_set_date
 grub_cmd_sleep
-/grub-editenv
-/grub-editenv.exe
 grub-emu
 grub-emu-lite
 grub-emu.exe
 grub-emu-lite.exe
 grub_emu_init.c
 grub_emu_init.h
-/grub-file
-/grub-file.exe
 grub-fstest
 grub-fstest.exe
 grub_fstest_init.c
@@ -72,21 +65,10 @@ grub_func_test
 grub-install
 grub-install.exe
 grub-kbdcomp
-/grub-macbless
-/grub-macbless.exe
 grub-macho2img
-/grub-menulst2cfg
-/grub-menulst2cfg.exe
-/grub-mk*
 grub-mount
-/grub-ofpathname
-/grub-ofpathname.exe
-/grub-core/build-grub-pe2elf.exe
-/grub-probe
-/grub-probe.exe
 grub_probe_init.c
 grub_probe_init.h
-/grub-reboot
 grub_script_blanklines
 grub_script_blockarg
 grub_script_break
@@ -128,26 +110,20 @@ grub-shell
 grub-shell-tester
 grub-sparc64-setup
 grub-sparc64-setup.exe
-/grub-syslinux2cfg
-/grub-syslinux2cfg.exe
 gzcompress_test
 hddboot_test
 help_test
 *.img
 *.image
 *.image.exe
-/include/grub/cpu
-/include/grub/machine
 INSTALL.grub
 install-sh
-/lib/libgcrypt-grub
 libgrub_a_init.c
 *.log
 *.lst
 lzocompress_test
 *.marker
 Makefile
-/m4
 *.mod
 mod-*.c
 missing
@@ -159,14 +135,6 @@ partmap_test
 pata_test
 *.pf2
 *.pp
-/po/*.mo
-/po/grub.pot
-/po/Makefile.in.in
-/po/Makevars
-/po/Makevars.template
-/po/POTFILES
-/po/Rules-quot
-/po/stamp-po
 printf_test
 priority_queue_unit_test
 pseries_test
@@ -190,13 +158,55 @@ compile
 depcomp
 mdate-sh
 texinfo.tex
-/grub-core/lib/libgcrypt-grub
 .deps
 .deps-util
 .deps-core
 .dirstamp
 Makefile.util.am
 contrib
+widthspec.bin
+widthspec.h
+Makefile.utilgcry.def
+
+#
+# Ignore patterns relative to this .gitignore file's directory.
+#
+/docs/*.info
+/docs/stamp-vti
+/docs/version.texi
+/gnulib
+/grub-bios-setup
+/grub-bios-setup.exe
+/grub-editenv
+/grub-editenv.exe
+/grub-file
+/grub-file.exe
+/grub-macbless
+/grub-macbless.exe
+/grub-menulst2cfg
+/grub-menulst2cfg.exe
+/grub-mk*
+/grub-ofpathname
+/grub-ofpathname.exe
+/grub-core/build-grub-pe2elf.exe
+/grub-probe
+/grub-probe.exe
+/grub-reboot
+/grub-syslinux2cfg
+/grub-syslinux2cfg.exe
+/include/grub/cpu
+/include/grub/machine
+/lib/libgcrypt-grub
+/m4
+/po/*.mo
+/po/grub.pot
+/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
@@ -214,11 +224,8 @@ contrib
 /util/bash-completion.d/grub
 /grub-core/lib/gnulib
 /grub-core/rs_decoder.h
-widthspec.bin
-widthspec.h
 /docs/stamp-1
 /docs/version-dev.texi
-Makefile.utilgcry.def
 /po/*.po
 /po/*.gmo
 /po/LINGUAS