diff --git a/ChangeLog b/ChangeLog
index d4eac29c..1a895855 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-03  Tadashi MATSUO  <tad@mymail.twin.jp>
+
+	* twittering-mode.el (twittering-edit-setup-help): generate help
+	message by using `substitute-command-keys'.
+
 2010-05-01  Immad Naseer  <immad.naseer@gmail.com>
 
 	* twittering-mode.el: New interactive functions for direct
diff --git a/twittering-mode.el b/twittering-mode.el
index 41edd8c8..d8b991b9 100644
--- a/twittering-mode.el
+++ b/twittering-mode.el
@@ -2062,14 +2062,15 @@ been initialized yet."
   (let* ((item (if (twittering-timeline-spec-is-direct-messages-p spec)
 		   (format "a direct message to %s" username)
 		 "a tweet"))
-	 (help-str (format "Keymap:
-  C-c C-c: send %s
-  C-c C-k: cancel %s
-  M-n    : next history element
-  M-p    : previous history element
+	 (help-str (format (substitute-command-keys "Keymap:
+  \\[twittering-edit-post-status]: send %s
+  \\[twittering-edit-cancel-status]: cancel %s
+  \\[twittering-edit-next-history]: next history element
+  \\[twittering-edit-previous-history]: previous history element
+  \\[twittering-edit-replace-at-point]: shorten URL at point
 
 ---- text above this line is ignored ----
-" item item))
+") item item))
 	 (help-overlay
 	  (or twittering-help-overlay
 	      (make-overlay 1 1 nil nil nil))))