diff --git a/.gitignore b/.gitignore
index f0308276c..dc93061a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,7 @@ grub-install
 grub-kbdcomp
 grub-macho2img
 grub-menulst2cfg
-grub-mk*
+/grub-mk*
 grub-mount
 grub-ofpathname
 grub-pe2elf
diff --git a/ChangeLog b/ChangeLog
index 2b84f8994..dae716056 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-15  Colin Watson  <cjwatson@debian.org>
+
+	* .gitignore: Only ignore grub-mk* at the top level.
+
 2013-11-15  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-reboot.in (usage): Fix a typo.