diff --git a/doc/ChangeLog b/doc/ChangeLog
index 382d9f7d2..f0c1cac4d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,16 @@
+2008-04-03  Werner Koch  <wk@g10code.com>
+
+	* yat2m.c (proc_texi_cmd): Remove extra apostrophe from @samp and
+	use open and close quote to @file and @env.
+
+2008-04-02  Werner Koch  <wk@g10code.com>
+
+	* opt-homedir.texi: Remove special case for Registry key.
+
+	* yat2m.c (proc_texi_cmd):  Use the \(aq glyph for @samp.  This is
+	bug#898.
+	(proc_texi_buffer): Handle backslashs correctly.
+
 2008-03-27  Werner Koch  <wk@g10code.com>
 
 	* Makefile.am (nobase_dist_doc_DATA, dist_html_DATA): New.  Move
diff --git a/doc/TRANSLATE b/doc/TRANSLATE
index 657502c4a..8dfc18348 100644
--- a/doc/TRANSLATE
+++ b/doc/TRANSLATE
@@ -43,7 +43,7 @@ entry looks like.
    .gpgsm.some.help-item
    This string has been translated.
 
-The percent sign is not a special character and if tehre is something
+The percent sign is not a special character and if there is something
 to watch out there will be a remark.
 
 
diff --git a/doc/opt-homedir.texi b/doc/opt-homedir.texi
index 387bd02ba..739c442da 100644
--- a/doc/opt-homedir.texi
+++ b/doc/opt-homedir.texi
@@ -6,9 +6,5 @@ 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
-@ifset isman
-@var{HKCU\\Software\\GNU\\GnuPG:HomeDir}.
-@end ifset
-@ifclear isman
 @var{HKCU\Software\GNU\GnuPG:HomeDir}.
-@end ifclear
+
diff --git a/doc/yat2m.c b/doc/yat2m.c
index 587428fa0..34e489a01 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -449,9 +449,9 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
     { "code",    0, "\\fB", "\\fR" },
     { "sc",      0, "\\fB", "\\fR" },
     { "var",     0, "\\fI", "\\fR" },
-    { "samp",    0, "'",  "'"  },
-    { "file",    0, "`\\fI","\\fR'" }, 
-    { "env",     0, "`\\fI","\\fR'" }, 
+    { "samp",    0, "\\(aq", "\\(aq"  },
+    { "file",    0, "\\(oq\\fI","\\fR\\(cq" }, 
+    { "env",     0, "\\(oq\\fI","\\fR\\(cq" }, 
     { "acronym", 0 },
     { "dfn",     0 },
     { "option",  0, "\\fB", "\\fR"   },
@@ -675,6 +675,8 @@ proc_texi_buffer (FILE *fp, const char *line, size_t len,
             }
           *eol_action = 0;
         }
+      else if (*s == '\\')
+        fputs ("\\\\", fp);
       else
         putc (*s, fp);
     }