diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bc3a32df6f..900489317a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* diff-mode.el (diff-beginning-of-file-and-junk): If we're on the
+	Index: line, don't search backward for the previous one.
+
 2008-02-10  ,AF(Bvar Arnfj,Av(Br,Ap(B Bjarmason  <avar@cpan.org>  (tiny change)
 
 	* net/rcirc.el (rcirc-url-regexp): Replace definition by copying
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 4c566b344a9..6794fab11f8 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -489,6 +489,7 @@ data such as \"Index: ...\" and such."
       (diff-file-next)
       (setq file (point)))
     (let ((index (save-excursion
+                   (forward-line 1)  ;In case we're looking at "Index:".
                    (re-search-backward "^Index: " prevhunk t))))
       (when index (setq file index))
       (if (<= file start)