diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5304cacd5ad..b0ee691afa9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* minibuffer.el (completion-pcm--merge-try): Also consider placing
+	point after a star, if that's the only place where modifications can
+	make progress.
+
 2009-12-05  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* vc-dir.el (vc-dir): Use the correct markup for showing keymaps
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index cfe4d6f90de..66895b0fdb0 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1984,7 +1984,9 @@ filter out additional entries (because TABLE migth not obey PRED)."
 	     ;; order of preference) either at the old point, or at
 	     ;; the last place where there's something to choose, or
 	     ;; at the very end.
-             (pointpat (or (memq 'point mergedpat) (memq 'any mergedpat)
+             (pointpat (or (memq 'point mergedpat)
+                           (memq 'any   mergedpat)
+                           (memq 'star  mergedpat)
 			   mergedpat))
              ;; New pos from the start.
              (newpos (length (completion-pcm--pattern->string pointpat)))