diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48f61a55552..a6b66ca2678 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-07-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* files.el (buffer-offer-save): Made permanently local (bug#6241).
+
 	* doc-view.el (doc-view-make-safe-dir): Rewrite the error message
 	to clarify what the problem is (bug#4291).
 
diff --git a/lisp/files.el b/lisp/files.el
index 0b253fcc297..6b8a352f20c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -151,6 +151,7 @@ Automatically local in all buffers."
   :type 'boolean
   :group 'backup)
 (make-variable-buffer-local 'buffer-offer-save)
+(put 'buffer-offer-save 'permanent-local t)
 
 (defcustom find-file-existing-other-name t
   "Non-nil means find a file under alternative names, in existing buffers.