diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 0b9e780b7b5..1df1ac92bf0 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-09  Daiki Ueno  <ueno@unixuser.org>
+
+	* epa.texi (Mail-mode integration): Mention the way to do
+	"encrypt-to-self".  (Bug#1807)
+
 2009-02-05  Arni Magnusson  <arnima@hafro.is>  (tiny change)
 
 	* ada-mode.texi (No project files): Fix typo.  (Bug#2214)
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 2008a530642..bedd370dae3 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -338,6 +338,10 @@ Compose a signed message from the current buffer.
 @kindex @kbd{C-c C-e e}
 @findex epa-mail-encrypt
 Compose an encrypted message from the current buffer.
+By default it tries to build the recipient list from @samp{to},
+@samp{cc}, and @samp{bcc} fields of the mail header.  To include your
+key in the recipient list, use @samp{encrypt-to} option in
+@file{~/.gnupg/gpg.conf}.
 
 @end table