diff --git a/doc/ChangeLog b/doc/ChangeLog
index eb29028dd..0eae30b77 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-26  Werner Koch  <wk@g10code.com>
+
+	* gpgv.texi: Minor fixes.  Fixes bug#918.
+
+	* opt-homedir.texi: Typo fixes.  Fixes bug#917.
+
 2008-05-26  Marcus Brinkmann  <marcus@g10code.de>
 
 	* tools.texi (Invoking gpgconf): Document --list-dirs.
diff --git a/doc/gpgv.texi b/doc/gpgv.texi
index 5a9f29754..0ee6614da 100644
--- a/doc/gpgv.texi
+++ b/doc/gpgv.texi
@@ -55,8 +55,8 @@ gpgv2
 @mansect description
 @code{@gpgvname} is an OpenPGP signature verification tool.
 
-This program is actually a stripped down version of @code{gpg} which is
-only able to check signatures. It is somewhat smaller than the fully blown
+This program is actually a stripped-down version of @code{gpg} which is
+only able to check signatures. It is somewhat smaller than the fully-blown
 @code{gpg} and uses a different (and simpler) way to check that
 the public keys used to make the signature are valid. There are
 no configuration files and only a few options are implemented.
@@ -114,7 +114,7 @@ checks into warnings.
 
 @mansect return value
 
-The program returns 0 if everything was fine, 1 if at least
+The program returns 0 if everything is fine, 1 if at least
 one signature was bad, and other error codes for fatal errors.
 
 @mansect examples
@@ -126,7 +126,7 @@ one signature was bad, and other error codes for fatal errors.
 @itemx @gpgvname @code{sigfile} 
 Verify the signature of the file. The second form
 is used for detached signatures, where @code{sigfile} is the detached
-signature (either ASCII armored or binary) and are the signed
+signature (either ASCII-armored or binary) and are the signed
 data; if this is not given the name of the file holding the signed data is
 constructed by cutting off the extension (".asc", ".sig" or ".sign") from
 @code{sigfile}.
@@ -152,7 +152,7 @@ If set directory used instead of "~/.gnupg".
 @table @asis
 
 @item ~/.gnupg/trustedkeys.gpg
-The default keyring with the allowed keys
+The default keyring with the allowed keys.
 
 @end table
 
diff --git a/doc/opt-homedir.texi b/doc/opt-homedir.texi
index 739c442da..e382f6368 100644
--- a/doc/opt-homedir.texi
+++ b/doc/opt-homedir.texi
@@ -1,10 +1,10 @@
 @c This option is included at several places.
 @item --homedir @var{dir}
 @opindex homedir
-Set the name of the home directory to @var{dir}. If his option is not
+Set the name of the home directory to @var{dir}. If this option is not
 used, the home directory defaults to @file{~/.gnupg}.  It is only
 recognized when given on the command line.  It also overrides any home
 directory stated through the environment variable @env{GNUPGHOME} or
-(on W32 systems) by means on the Registry entry
+(on W32 systems) by means of the Registry entry
 @var{HKCU\Software\GNU\GnuPG:HomeDir}.
 
diff --git a/doc/tools.texi b/doc/tools.texi
index cbcde6a56..5d33616be 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -1069,7 +1069,7 @@ for other users.
 @mansect synopsis
 @ifset manverb
 .B  gpg-connect-agent
-.RI [ options ]
+.RI [ options ] [commands]
 @end ifset
 
 @mansect description
@@ -1095,7 +1095,7 @@ here we connect to a running instance.
 @command{gpg-connect-agent} is invoked this way:
 
 @example
-gpg-connect-agent [options]
+gpg-connect-agent [options] [commands]
 @end example
 @mancont
 
@@ -1132,7 +1132,7 @@ execute it as an assuan server. Here is how you would run @command{gpgsm}:
 @smallexample
  gpg-connect-agent --exec gpgsm --server
 @end smallexample
-
+Note that you may not use options on the command line in this case.
 
 @item --no-ext-connect
 @opindex no-ext-connect
@@ -1143,7 +1143,8 @@ passing.  This option makes it use the old mode.
 @item --run @var{file}
 @opindex run 
 Run the commands from @var{file} at startup and then continue with the
-regular input method.
+regular input method.  Note, that commands given on the command line are
+executed after this file.
 
 @item -s
 @itemx --subst
@@ -1180,7 +1181,7 @@ Set the variable @var{name} to @var{value}.  Variables are only
 substituted on the input if the @command{/subst} has been used.
 Variables are referenced by prefixing the name with a dollr sign and
 optionally include the name in curly braces.  The rules for a valid name
-are idnetically to those of the standard bourne shell.  This is not yet
+are identically to those of the standard bourne shell.  This is not yet
 enforced but may be in the future.  When used with curly braces no
 leading or trailing white space is allowed.