diff --git a/common/ChangeLog b/common/ChangeLog
index 9f4db9b81..88675f5b3 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-04  Werner Koch  <wk@g10code.com>
+
+	* logging.c (do_logv) [W32]: Don't set a default log stream if the
+	registry entry is empty.
+
 2010-10-27  Werner Koch  <wk@g10code.com>
 
 	* gettime.c (gnupg_get_isotime): Compare to (time_t)-1.
diff --git a/common/logging.c b/common/logging.c
index 6b9fa5e23..37b890d03 100644
--- a/common/logging.c
+++ b/common/logging.c
@@ -577,7 +577,7 @@ do_logv (int level, int ignore_arg_ptr, const char *fmt, va_list arg_ptr)
 
       tmp = read_w32_registry_string (NULL, "Software\\GNU\\GnuPG",
                                             "DefaultLogFile");
-      log_set_file (tmp);
+      log_set_file (tmp && *tmp? tmp : NULL);
       jnlib_free (tmp);
 #else
       log_set_file (NULL); /* Make sure a log stream has been set.  */