diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27515f767fb..a75c5330ed9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* epa-file.el (epa-file-select-keys): Revert to nil default (bug#9280).
+
 2011-08-12  Daiki Ueno  <ueno@unixuser.org>
 
 	* epa.el (epa-progress-callback-function): Fix the logic of
@@ -14,8 +18,8 @@
 	Use string-mark-left-to-right.
 	(list-buffers-noselect): Caller changed.
 
-	* emacs-lisp/tabulated-list.el (tabulated-list-print-entry): Use
-	string-mark-left-to-right.
+	* emacs-lisp/tabulated-list.el (tabulated-list-print-entry):
+	Use string-mark-left-to-right.
 	(tabulated-list-print): Recenter after moving point.
 
 2011-08-10  Juri Linkov  <juri@jurta.org>
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 118f44854cf..bef67ba4f69 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -35,7 +35,7 @@ way."
   :type 'boolean
   :group 'epa-file)
 
-(defcustom epa-file-select-keys 'silent
+(defcustom epa-file-select-keys nil
   "Control whether or not to pop up the key selection dialog.
 
 If t, always asks user to select recipients.