diff --git a/ChangeLog b/ChangeLog
index 977eee5b7..428dec50f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-07  Robert Millan  <rmh@aybabtu.com>
+
+	* boot/i386/pc/boot.S (boot_drive_check): Add a comment indicating
+	which instruction is modified by grub-setup during installation
+	(since it wasn't obvious by only looking at this file).
+
 2008-01-07  Robert Millan  <rmh@aybabtu.com>
 
 	* TODO: Rewrite.  Just refer to the wiki and the BTS instead of
diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S
index 951be85ee..187b7d2d4 100644
--- a/boot/i386/pc/boot.S
+++ b/boot/i386/pc/boot.S
@@ -114,7 +114,7 @@ after_BPB:
          * this does nothing (only jump).
          */
 boot_drive_check:
-        jmp     1f
+        jmp     1f	/* grub-setup may overwrite this jump */
         testb   $0x80, %dl
         jnz     1f
         movb    $0x80, %dl