diff --git a/doc/Makefile.am b/doc/Makefile.am
index e7ceb48f1..11c5d9a98 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -73,7 +73,7 @@ faq.html : faq.raw
 	$(FAQPROG) -h -f $< $@ 2>&1 || $(FAQPROG) -h -f $< $@
 
 dist-hook:
-	@if test `wc -c < gpg.1` -lt 200; then \
+	@if test "`wc -c < gpg.1`" -lt 200; then \
 	    echo 'ERROR: dummy man page'; false; fi
 
 
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index caefc3292..8bf03162e 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -210,6 +210,16 @@ ones given on the command line.
 </para></listitem></varlistentry>
 
 
+<varlistentry>
+<term>--show-keyring</term>
+<listitem><para>
+Causes --list-keys, --list-public-keys, and --list-secret-keys to
+display the name of the keyring a given key resides on. This is only
+useful when you're listing a specific key or set of keys. It has no
+effect when listig all keys.
+</para></listitem></varlistentry>
+
+
 <varlistentry>
 <term>--list-sigs &OptParmNames;</term>
 <listitem><para>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index bbdbfc0b4..db5be15a8 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -94,6 +94,12 @@ ones given on the command line.
 List all keys from the secret keyrings, or just the
 ones given on the command line.
 
+@item ---show-keyring
+Causes ---list-keys, --list-public-keys, and --list-secret-keys to
+display the name of the keyring a given key resides on. This is only
+useful when you're listing a specific key or set of keys. It has no
+effect when listig all keys.
+
 @item ---list-sigs @code{names}
 Same as ---list-keys, but the signatures are listed too.