diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da8b2f3cc93b849a3aaef0040a166b201c9c140c..6de4bd738d3846250e60a143cf19e406cbcad981 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-22  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* play/fortune.el (fortune-in-buffer): Fix a bug which forced
+	usage of `fortune-file' even though a FILE argument was passed to
+	the function.
+
 2008-09-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* startup.el (command-line): Start the server when in daemon mode.
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 2d548c3b220113ad1d02d57cbe8eb58371237748..1e8e7315372d1ef9f09d460f087fb37db6a90412 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -306,7 +306,7 @@ when supplied, specifies the file to choose the fortune from."
              nil fortune-buffer nil     ; INFILE BUFFER DISPLAY
              (append (if (stringp fortune-program-options)
                          (split-string fortune-program-options)
-                       fortune-program-options) (list fortune-file))))))
+                       fortune-program-options) (list fort-file))))))
 
 ;;;###autoload
 (defun fortune (&optional file)