diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 984ef8384c7..40eef086a4e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2001-08-21  Gerd Moellmann  <gerd@gnu.org>
 
+	* image.el (image-type-regexps): Make sure that the TIFF
+	pattern is only matched at the beginning of a string.
+	From Markus Rost <rost@math.ohio-state.edu>.
+
 	* international/swedish.el: Pre-Mule file removed.  From: Jonas
 	Oberg <jonas@gnu.org>.
 
diff --git a/lisp/image.el b/lisp/image.el
index f7ab77379dc..e4c2387d78e 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -36,7 +36,7 @@
     ("\\`GIF8" . gif)
     ("\\`\211PNG\r\n" . png)
     ("\\`[\t\n\r ]*#define" . xbm)
-    ("\\`\\(MM\0\\*\\)\\|\\(II\\*\0\\)" . tiff)
+    ("\\`\\(MM\0\\*\\|II\\*\0\\)" . tiff)
     ("\\`[\t\n\r ]*%!PS" . postscript)
     ("\\`\xff\xd8" . (image-jpeg-p . jpeg)))
   "Alist of (REGEXP . IMAGE-TYPE) pairs used to auto-detect image types.