diff --git a/NEWS b/NEWS
index 17eb23009..3ade21fd0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 Noteworthy changes in version 2.0.17 (unreleased)
 -------------------------------------------------
 
+ * Fixed output of "gpgconf --check-options".
+
 
 Noteworthy changes in version 2.0.16 (2010-07-19)
 -------------------------------------------------
diff --git a/README b/README
index 2f5cb211a..626c9a178 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ INTRODUCTION
 GnuPG is GNU's tool for secure communication and data storage.  It can
 be used to encrypt data and to create digital signatures.  It includes
 an advanced key management facility and is compliant with the proposed
-OpenPGP Internet standard as described in RFC2440 and the S/MIME
+OpenPGP Internet standard as described in RFC4880 and the S/MIME
 standard as described by several RFCs.
 
 GnuPG is distributed under the terms of the GNU General Public
diff --git a/tools/ChangeLog b/tools/ChangeLog
index fd0052700..039764df4 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-23  Werner Koch  <wk@g10code.com>
+
+	* gpgconf-comp.c (retrieve_options_from_program)
+	(retrieve_options_from_file, copy_file): Do not use ferror after a
+	failed fclose.  Note that the stream is in any case invalid after
+	calling fclose and that fclose does set ERRNO.
+
 2010-08-19  Werner Koch  <wk@g10code.com>
 
 	* gpgconf.c (main): Fix --check-options.
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 7ba526f69..1b0e44604 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1903,7 +1903,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend)
     }
   if (length < 0 || ferror (config))
     gc_error (1, errno, "error reading from %s",pgmname);
-  if (fclose (config) && ferror (config))
+  if (fclose (config))
     gc_error (1, errno, "error closing %s", pgmname);
 
   err = gnupg_wait_process (pgmname, pid, &exitcode);
@@ -2004,7 +2004,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend)
 
       if (length < 0 || ferror (config))
 	gc_error (1, errno, "error reading from %s", config_filename);
-      if (fclose (config) && ferror (config))
+      if (fclose (config))
 	gc_error (1, errno, "error closing %s", config_filename);
     }
 
@@ -2084,7 +2084,7 @@ retrieve_options_from_file (gc_component_t component, gc_backend_t backend)
   if (config_option->flags & GC_OPT_FLAG_NO_CHANGE)
     list_option->flags |= GC_OPT_FLAG_NO_CHANGE;
 
-  if (list_file && fclose (list_file) && ferror (list_file))
+  if (list_file && fclose (list_file))
     gc_error (1, errno, "error closing %s", list_filename);
   xfree (line);
 }
@@ -2305,9 +2305,9 @@ copy_file (const char *src_name, const char *dst_name)
       return -1;
     }
 
-  if (fclose (dst) && ferror (dst))
+  if (fclose (dst))
     gc_error (1, errno, "error closing %s", dst_name);
-  if (fclose (src) && ferror (src))
+  if (fclose (src))
     gc_error (1, errno, "error closing %s", src_name);
 
   return 0;