diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16c4983d385..593b2a935b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* repeat.el (repeat): Set real-this-command (bug#12232).
+
 	* htmlfontify.el (hfy-post-html-hook):
 	* filesets.el (filesets-cache-fill-content-hook):
 	* arc-mode.el (archive-extract-hook):
diff --git a/lisp/repeat.el b/lisp/repeat.el
index e38442a434b..a6c803ae773 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -289,6 +289,10 @@ recently executed command not bound to an input event\"."
                  (interactive)
                  (let ((repeat-message-function fun))
                    (setq this-command 'repeat)
+		   ;; Beware: messing with `real-this-command' is *bad*, but we
+		   ;; need it so `last-repeatable-command' can be recognized
+		   ;; later (bug#12232).
+                   (setq real-this-command 'repeat)
                    (call-interactively 'repeat))))))
          map)))))