diff --git a/THANKS b/THANKS
index 5857dddca..04626c0ba 100644
--- a/THANKS
+++ b/THANKS
@@ -138,6 +138,7 @@ Katsuhiro Kondou	   kondou at nec.co.jp
 Kazu Yamamoto              kazu at iij.ad.jp
 Kazuyoshi Kakihara         
 Keith Clayton              keith at claytons.org
+Ken Takusagawa             ken.takusagawa.2  at gmail.com
 Kevin Ryde                 user42 at zip.com.au
 Klaus Singvogel            ks at caldera.de
 Kurt Garloff               garloff at suse.de
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4064ee651..f68283bac 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-30  Werner Koch  <wk@g10code.com>
+
+	* gpgsm.texi (GPGSM Configuration): Mention com-cert.pem.
+
 2008-06-25  Werner Koch  <wk@g10code.com>
 
 	* qualified.txt: Add new BnetzA certs 12R and 13R.
diff --git a/doc/debugging.texi b/doc/debugging.texi
index 1c9ec8413..f88f69372 100644
--- a/doc/debugging.texi
+++ b/doc/debugging.texi
@@ -208,6 +208,26 @@ The signature is broken.  You may try the option
 number N is the internal algorighm indentifier; for example 8 refers to
 SHA-256.
 
+
+@item The Windows version does not work under Wine
+
+When running the W32 version of @command{gpg} under Wine you may get
+an error messages like:
+
+@smallexample
+gpg: fatal: WriteConsole failed: Access denied
+@end smallexample
+
+@noindent
+The solution is to use the command @command{wineconsole}. 
+
+Some operations like gen-key really want to talk to the console directly
+for increased security (for example to prevent the passphrase from
+appearing on the screen).  So, you should use @command{wineconsole}
+instead of @command{wine}, which will launch a windows console that
+implements those additional features.
+
+
 @end itemize
 
 
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 3193e852f..9e23ffcb8 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -787,6 +787,14 @@ For a reference of the help file's syntax, please see the installed
 @file{help.txt} file.
 
 
+@item com-certs.pem
+@cindex com-certs.pem
+This file is a collection of common certificates used to populated a
+newly created @file{pubring.kbx}.  An administrator may replace this
+file with a custom one.  The format is a concatenation of PEM encoded
+X.509 certificates.  This global file is installed in the data directory
+(e.g. @file{/usr/share/gnupg/qualified.txt}).
+
 @end table
 
 @c man:.RE
@@ -796,7 +804,7 @@ start up with a working configuration.  For existing users the a small
 helper script is provided to create these files (@pxref{addgnupghome}).
 
 For internal purposes gpgsm creates and maintaines a few other files;
-They all live in in the current home directory (@pxref{option
+they all live in in the current home directory (@pxref{option
 --homedir}).  Only @command{gpgsm} may modify these files.
 
 
@@ -806,7 +814,7 @@ They all live in in the current home directory (@pxref{option
 This a database file storing the certificates as well as meta
 information.  For debugging purposes the tool @command{kbxutil} may be
 used to show the internal structure of this file.
-      
+
 @item random_seed
 @cindex random_seed
 This content of this file is used to maintain the internal state of the
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 6a5675135..df9d01a77 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -266,7 +266,7 @@ This enables the use of Admin class commands for card applications
 where this is supported.  Currently we support it for the OpenPGP
 card.  Deny is the default.  This commands is useful to inhibit
 accidental access to admin class command which could ultimately lock
-the card through worng PIN numbers.
+the card through wrong PIN numbers.
 
 @item --disable-application @var{name}
 @opindex disable-application
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 4aa1ed114..5df38e5c2 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-01  Werner Koch  <wk@g10code.com>
+
+	* tdbio.c (open_db) [!EROFS]: Move closing parens out of the
+	ifdef.  Reported by Ken Takusagawa.
+
 2008-06-25  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpg.c (enum cmd_and_opt_values): Remove option
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 93628499e..231f451e7 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -603,8 +603,9 @@ open_db()
   db_fd = open (db_name, O_RDWR | MY_O_BINARY );
   if (db_fd == -1 && (errno == EACCES
 #ifdef EROFS
-                      || errno == EROFS)
+                      || errno == EROFS
 #endif
+                      )
       ) {
       db_fd = open (db_name, O_RDONLY | MY_O_BINARY );
       if (db_fd != -1)
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 7e851a249..fad0c00b3 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,7 +1,7 @@
 2008-06-19  Werner Koch  <wk@g10code.com>
 
 	* gpgconf-comp.c (GC_ARG_TYPE_ALIAS_LIST): New.
-	(gc_arg_type): Add fallbacl type.
+	(gc_arg_type): Add fallback type.
 	(gc_options_gpg): Add option "group".
 
 2008-06-12  Marcus Brinkmann  <marcus@g10code.de>