diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5d527dcd330..3a196095597 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* subr.el (internal-temp-output-buffer-show): Rename from
+	temp-output-buffer-show, since previously compiled files expect this name.
+
 2012-10-23  Glenn Morris  <rgm@gnu.org>
 
 	* image.el (image-type-from-file-name): If multiple types match,
diff --git a/lisp/subr.el b/lisp/subr.el
index ec2d16e6529..0f30976b023 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3151,7 +3151,7 @@ in which case `save-window-excursion' cannot help."
        (unwind-protect (progn ,@body)
          (set-window-configuration ,c)))))
 
-(defun temp-output-buffer-show (buffer)
+(defun internal-temp-output-buffer-show (buffer)
   "Internal function for `with-output-to-temp-buffer'."
   (with-current-buffer buffer
     (set-buffer-modified-p nil)
@@ -3235,7 +3235,7 @@ if it uses `temp-buffer-show-function'."
                    (run-hooks 'temp-buffer-setup-hook)))))
             (standard-output ,buf))
        (prog1 (progn ,@body)
-         (temp-output-buffer-show ,buf)))))
+         (internal-temp-output-buffer-show ,buf)))))
 
 (defmacro with-temp-file (file &rest body)
   "Create a new buffer, evaluate BODY there, and write the buffer to FILE.