diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e742a5f0e..e46a8eddf 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-09  Bastien Guerry  <bzg@altern.org>
+
+	* org.el (org-check-agenda-file): Use a more explicit message
+
 2009-09-08  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-exp.el (org-export-remove-special-table-lines): Don't remove
diff --git a/lisp/org.el b/lisp/org.el
index 39ef4666e..8ff0393d0 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -13788,7 +13788,7 @@ Optional argument FILE means, use this file instead of the current."
 (defun org-check-agenda-file (file)
   "Make sure FILE exists.  If not, ask user what to do."
   (when (not (file-exists-p file))
-    (message "non-existent file %s. [R]emove from list or [A]bort?"
+    (message "non-existent agenda file %s. [R]emove from list or [A]bort?"
 	     (abbreviate-file-name file))
     (let ((r (downcase (read-char-exclusive))))
       (cond