diff --git a/doc/ChangeLog b/doc/ChangeLog
index 07439384c..b7dc01eb8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+2003-05-26  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.sgml, gpgv.sgml: Small SGML fixes. (From wk on stable
+	branch)
+
+	* gnupg-w32.reg: Use HLM for the program and make sure the entries
+	are created.  Suggested by danielc@analysisandsolutions.com. (From
+	wk on stable branch)
+
 2003-05-24  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpg.sgml: Document --trustdb-name.  Document --gnupg in a new
diff --git a/doc/gnupg-w32.reg b/doc/gnupg-w32.reg
index 7a6e346a8..10a3deab4 100644
--- a/doc/gnupg-w32.reg
+++ b/doc/gnupg-w32.reg
@@ -1,8 +1,27 @@
 REGEDIT4
 
-[HKEY_CURRENT_USER\Software\GNU\GNUPG]
+[HKEY_LOCAL_MACHINE\Software\GNU]
+
+[HKEY_LOCAL_MACHINE\Software\GNU\GNUPG]
+
+[HKEY_LOCAL_MACHINE\Software\GNU\GNUPG]
 "HomeDir"="C:\\GnuPG"
 "gpgProgram"="C:\\GnuPG\\gpg.exe"
 
+
+[HKEY_CURRENT_USER\Control Panel\Mingw32]
+
+[HKEY_CURRENT_USER\Control Panel\Mingw32\NLS]
+
 [HKEY_CURRENT_USER\Control Panel\Mingw32\NLS]
 "MODir"="C:\\GnuPG\\Locale"
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 31807948b..bf8351366 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -59,11 +59,11 @@
 </refnamediv>
 <refsynopsisdiv>
   <synopsis>
-<command>gpg</>
+<command>gpg</command>
  <optional>--homedir <parameter/name/</optional>
  <optional>--options <parameter/file/</optional>
  <optional><parameter/options/</optional>
- <parameter>command</>
+ <parameter>command</parameter>
  <optional><parameter/args/</optional>
   </synopsis>
 </refsynopsisdiv>
@@ -1784,7 +1784,7 @@ option.
 <term>--gpg-agent-info</term>
 <listitem><para>
 Override the value of the environment variable
-<literal>GPG_AGENT_INFO</>.  This is only used when --use-agent has been given
+<literal>GPG_AGENT_INFO</literal>.  This is only used when --use-agent has been given
 </para></listitem></varlistentry>
 
 <varlistentry>
@@ -2208,7 +2208,7 @@ handy in case where an encrypted message contains a bogus key ID.
 <term>--enable-special-filenames</term>
 <listitem><para>
 This options enables a mode in which filenames of the form
-<filename>-&#38;n</>, where n is a non-negative decimal number,
+<filename>-&#38;n</filename>, where n is a non-negative decimal number,
 refer to the file descriptor n and not to a file with that name.
 </para></listitem></varlistentry>
 
diff --git a/doc/gpgv.sgml b/doc/gpgv.sgml
index 4119b41dc..711b0efef 100644
--- a/doc/gpgv.sgml
+++ b/doc/gpgv.sgml
@@ -57,7 +57,7 @@
 </refnamediv>
 <refsynopsisdiv>
   <synopsis>
-<command>gpgv</>
+<command>gpgv</command>
  <optional><parameter/options/</optional>
  <optional><parameter/signed files/</optional>
   </synopsis>