diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f36f99ebdba..c2b968ea9dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-18  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* doc-view.el (doc-view-initiate-display): Use doc-view-doc-type
+	instead of file name extension to make docs with uncommon
+	extensions work.
+
 2008-03-18  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* doc-view.el (require): Require cl at compile time because
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 2c7862df885..da8edaaaed6 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -957,7 +957,7 @@ If BACKWARD is non-nil, jump to the previous match."
 
 (defun doc-view-initiate-display ()
   ;; Switch to image display if possible
-  (if (doc-view-mode-p (intern (file-name-extension doc-view-buffer-file-name)))
+  (if (doc-view-mode-p doc-view-doc-type)
       (progn
 	(doc-view-buffer-message)
 	(setf (doc-view-current-page) (or (doc-view-current-page) 1))