diff --git a/doc/ChangeLog b/doc/ChangeLog
index 479a2abfb..0e8dced15 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-06  Werner Koch  <wk@gnupg.org>
+
+	* gpg.sgml: Fixed doc regarding the name change of the option
+	file.
+
 2002-07-30  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpg.sgml: Clarify --edit/addrevoker (sensitive), and
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 98610b699..7899b51b8 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -706,7 +706,7 @@ all options.
 <refsect1>
 <title>OPTIONS</title>
 <para>
-Long options can be put in an options file (default "~/.gnupg/options").
+Long options can be put in an options file (default "~/.gnupg/gpg.conf").
 Do not write the 2 dashes, but simply the name of the option and any
 required arguments. Lines with a hash as the first non-white-space
 character are ignored. Commands may be put in this file too, but that
@@ -2360,9 +2360,15 @@ be used to overide it.</para></listitem>
 <listitem><para>used to preserve the internal random pool</para></listitem>
 </varlistentry>
 
+<varlistentry>
+<term>~/.gnupg/gpg.conf</term>
+<listitem><para>Default configuration file</para></listitem>
+</varlistentry>
+
 <varlistentry>
 <term>~/.gnupg/options</term>
-<listitem><para>May contain options</para></listitem>
+<listitem><para>Old style configuration file; only used when gpg.conf
+is not found</para></listitem>
 </varlistentry>
 
 <varlistentry>
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 03daf0fd8..aa5f656db 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,7 @@
 2002-08-06  Werner Koch  <wk@gnupg.org>
 
+	* options.skel: Changed comments.
+
 	* g10.c (main): Try to use "gpg.conf" as default option file.
 	* openfile.c (copy_options_file): Changed name of created file.
 
diff --git a/g10/options.skel b/g10/options.skel
index 1d0906eea..ff0eb4d80 100644
--- a/g10/options.skel
+++ b/g10/options.skel
@@ -1,4 +1,4 @@
-These first three lines are not copied to the options file in
+These first three lines are not copied to the gpg.conf file in
 the users home directory.
 $Id$
 # Options for GnuPG
@@ -14,7 +14,7 @@ $Id$
 #
 # Unless you you specify which option file to use (with the
 # command line option "--options filename"), GnuPG uses the
-# file ~/.gnupg/options by default.
+# file ~/.gnupg/gpg.conf by default.
 #
 # An option file can contain all long options which are
 # available in GnuPG. If the first non white space character of