diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d99f230388..9a29f22ea5b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-08-07  Gerd Moellmann  <gerd@gnu.org>
 
+	* image.el (image-type-regexps): For JPEG files, use a regexp
+	derived from the JPEG spec.
+	
 	* image.el (image-type-regexps): Use `\`' instead of `^' in
 	most regular expressions.
 
diff --git a/lisp/image.el b/lisp/image.el
index 14b9da5cf07..e0d19f5b776 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -34,7 +34,8 @@
   '(("\\`/\\*.*XPM.\\*/" . xpm)
     ("\\`P[1-6]" . pbm)
     ("\\`GIF8" . gif)
-    ("JFIF" . jpeg)
+    ;; The following is from JPEG File Interchange Format, Version 1.02.
+    ("\\`\xff\xd8\xff\xe0..JFIF\0" . jpeg)
     ("\\`\211PNG\r\n" . png)
     ("\\`#define" . xbm)
     ("\\`\\(MM\0\\*\\)\\|\\(II\\*\0\\)" . tiff)