diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index d6f3e4afb8d..07a22698c6e 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -277,7 +277,12 @@ function definitions, values or properties are considered."
 	   (insert completion))
 	  (t
 	   (message "Making completion list...")
-	   (let ((list (all-completions pattern obarray predicate)))
+	   (let ((list (all-completions pattern obarray predicate))
+		 (completion-fixup-function
+		  (function (lambda () (if (save-excursion
+					     (goto-char (max (point-min) (- (point) 4)))
+					     (looking-at " <f>"))
+					   (forward-char -4))))))
 	     (or (eq predicate 'fboundp)
 		 (let (new)
 		   (while list