diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 813abd506d4..973d920c373 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-09-22  Chong Yidong  <cyd@gnu.org>
 
+	* files.el (ctl-x-map): Bind C-x C-q to read-only-mode
+	(Bug#12462).
+
 	* repeat.el (repeat): Doc fix (Bug#12348).
 
 	* emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix
diff --git a/lisp/files.el b/lisp/files.el
index 289f5c6b0b6..66c526266e6 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6714,7 +6714,7 @@ Otherwise, trash FILENAME using the freedesktop.org conventions,
 (define-key esc-map "~" 'not-modified)
 (define-key ctl-x-map "\C-d" 'list-directory)
 (define-key ctl-x-map "\C-c" 'save-buffers-kill-terminal)
-(define-key ctl-x-map "\C-q" 'toggle-read-only)
+(define-key ctl-x-map "\C-q" 'read-only-mode)
 
 (define-key ctl-x-4-map "f" 'find-file-other-window)
 (define-key ctl-x-4-map "r" 'find-file-read-only-other-window)