diff --git a/src/ChangeLog b/src/ChangeLog
index 15873d2550b8fe023a66d0c4a73eee96c08eaf3f..1ac5cc65241b7506b334a8966440d61f24ec91be 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-09  Juri Linkov  <juri@jurta.org>
+
+	* buffer.c (Frename_buffer): Change interactive spec from "s" to
+	Lisp code that uses `read-buffer' with current buffer as default.
+
 2007-12-08  Michael Albinus  <michael.albinus@gmx.de>
 
 	* dbusbind.c (xd_read_message): Generate an event for every
diff --git a/src/buffer.c b/src/buffer.c
index ad76c185c5e44856a29f071b0e47ca92f0e6b492..cfaacc289050dba91c7565a17b75765ce23bff11 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1169,7 +1169,8 @@ buffer as BUFFER.  */)
 }
 
 DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2,
-       "sRename buffer (to new name): \nP",
+       "(list (read-buffer \"Rename buffer (to new name): \" \
+	      (current-buffer)) current-prefix-arg)",
        doc: /* Change current buffer's name to NEWNAME (a string).
 If second arg UNIQUE is nil or omitted, it is an error if a
 buffer named NEWNAME already exists.