diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bda9ac0d4aa..c43b0c136e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* bookmark.el (bookmark-completing-read): Set the completion category
+	to `bookmark' (bug#11131).
+
 2012-10-26  Bastien  <bzg@altern.org>
             Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 838e5a5ec00..78ca6f22c8e 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -433,7 +433,11 @@ the empty string."
                                     ": ")))
 	   (str
 	    (completing-read prompt
-			     bookmark-alist
+			     (lambda (string pred action)
+                               (if (eq action 'metadata)
+                                   '(metadata (category . bookmark))
+                                 (complete-with-action
+                                  action bookmark-alist string pred)))
 			     nil
 			     0
 			     nil