diff --git a/g10/ChangeLog b/g10/ChangeLog
index ea6eb8b10..b848f2d0c 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-15  Werner Koch  <wk@g10code.com>
+
+	* tdbio.c (tdbio_set_dbname): Do not call log_fatal after creating
+	the directory.  Fixes bug#1169.  Reported by Daniel Leidert.
+
 2009-12-04  Werner Koch  <wk@g10code.com>
 
 	* keygen.c (DEFAULT_STD_ALGO, DEFAULT_STD_KEYSIZE): New.
diff --git a/g10/tdbio.c b/g10/tdbio.c
index c0dd5abf4..738f758ee 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -521,7 +521,8 @@ tdbio_set_dbname( const char *new_dbname, int create )
 	    *p = 0;
 	    if( access( fname, F_OK ) ) {
 		try_make_homedir( fname );
-		log_fatal( _("%s: directory does not exist!\n"), fname );
+                if (access (fname, F_OK ))
+                  log_fatal (_("%s: directory does not exist!\n"), fname);
 	    }
 	    *p = save_slash;