diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 350dd50e1..5e228ecea 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,9 @@
 
 	* org.el (org-get-wdays): Find the warning period also if it is in
 	the wrong place.
+	(org-ido-completing-read): Provide the correct arguments to
+	ido-completing-read and bind `ido-enter-matching-directory' to
+	nil.
 
 2009-02-17  Carsten Dominik  <carsten.dominik@gmail.com>
 
diff --git a/lisp/org.el b/lisp/org.el
index c74e6c041..5d7f7425e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7044,9 +7044,13 @@ used as the link location instead of reading one interactively."
 	   (fboundp 'ido-completing-read)
 	   (boundp 'ido-mode) ido-mode
 	   (listp (second args)))
-      (apply 'ido-completing-read (concat (car args)) (cdr args))
+      (let ((ido-enter-matching-directory nil))
+	(apply 'ido-completing-read (concat (car args))
+	       (mapcar (lambda (x) (car x)) (nth 1 args))
+	       (cddr args)))
     (apply 'completing-read args)))
 
+
 (defun org-extract-attributes (s)
   "Extract the attributes cookie from a string and set as text property."
   (let (a attr (start 0) key value)