diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20dc9b64d..0bbc60324 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-11-18  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-remember.el (org-remember-apply-template): No ido
+	completion for free prompts in remember templates.
+
 	* org-id.el (org-id-add-location): Avoid error when no file is
 	given.
 
diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index dd6bc0484..917856f1a 100644
--- a/lisp/org-remember.el
+++ b/lisp/org-remember.el
@@ -530,11 +530,12 @@ to be run from that hook to function properly."
 				   (member char '("u" "U"))
 				   nil nil (list org-end-time-was-given)))
 	   (t
-	    (insert (org-completing-read
-		     (concat (if prompt prompt "Enter string")
-			     (if default (concat " [" default "]"))
-			     ": ")
-		     completions nil nil nil histvar default)))))
+	    (let (org-completion-use-ido)
+	      (insert (org-completing-read
+		       (concat (if prompt prompt "Enter string")
+			       (if default (concat " [" default "]"))
+			       ": ")
+		       completions nil nil nil histvar default))))))
 	(goto-char (point-min))
 	(if (re-search-forward "%\\?" nil t)
 	    (replace-match "")