diff --git a/src/buffer.c b/src/buffer.c
index 291c7d3f911..5e2386c94fa 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1686,7 +1686,11 @@ DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2,
 	 with the original name.  It makes UNIQUE equivalent to
 	 (rename-buffer (generate-new-buffer-name NEWNAME)).  */
       if (NILP (unique) && XBUFFER (tem) == current_buffer)
-	return BVAR (current_buffer, name);
+	{
+	  bset_last_name (current_buffer, oldname);
+
+	  return BVAR (current_buffer, name);
+	}
       if (!NILP (unique))
 	newname = Fgenerate_new_buffer_name (newname, oldname);
       else