diff --git a/g10/ChangeLog b/g10/ChangeLog
index 93da02b75..a09a0ddce 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-06  David Shaw  <dshaw@jabberwocky.com>
+
+	* options.skel: Add a section for --encrypt-to.  This is Debian
+	bug 336211 by Javier Fernández-Sanguino Peña.
+
 2005-11-05  David Shaw  <dshaw@jabberwocky.com>
 
 	* Makefile.am: Include @LIBUSB_CPPFLAGS@ in our CPPFLAGS.
diff --git a/g10/options.skel b/g10/options.skel
index 37bf87c12..e9c0518a8 100644
--- a/g10/options.skel
+++ b/g10/options.skel
@@ -39,6 +39,14 @@
 #default-recipient some-user-id
 #default-recipient-self
 
+# Use --encrypt-to to add the specified key as a recipient to all
+# messages.  This is useful, for example, when sending mail through a
+# mail client that does not automatically encrypt mail to your key.
+# In the example, this option allows you to read your local copy of
+# encrypted mail that you've sent to others.
+
+#encrypt-to some-key-id
+
 # By default GnuPG creates version 3 signatures for data files.  This
 # is not strictly OpenPGP compliant but PGP 6 and most versions of PGP
 # 7 require them.  To disable this behavior, you may use this option