diff --git a/g10/ChangeLog b/g10/ChangeLog
index 716705bd5..7b9d2443e 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-12  David Shaw  <dshaw@jabberwocky.com>
+
+	* tdbio.c (tdbio_set_dbname): Fix assertion failure with
+	non-fully-qualified trustdb names.
+
 2003-01-11  David Shaw  <dshaw@jabberwocky.com>
 
 	* trustdb.c (get_validity_info, get_ownertrust_info,
diff --git a/g10/tdbio.c b/g10/tdbio.c
index c7f04f441..47dc51e2d 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -474,9 +474,18 @@ tdbio_set_dbname( const char *new_dbname, int create )
 	atexit( cleanup );
 	initialized = 1;
     }
-    fname = new_dbname? m_strdup( new_dbname )
-		      : make_filename(opt.homedir,
-		                      "trustdb" EXTSEP_S "gpg", NULL );
+
+    if(new_dbname==NULL)
+      fname=make_filename(opt.homedir,"trustdb" EXTSEP_S "gpg", NULL);
+    else if (*new_dbname != DIRSEP_C )
+      {
+	if (strchr(new_dbname, DIRSEP_C) )
+	  fname = make_filename (new_dbname, NULL);
+	else
+	  fname = make_filename (opt.homedir, new_dbname, NULL);
+      }
+    else
+      fname = m_strdup (new_dbname);
 
     if( access( fname, R_OK ) ) {
 	if( errno != ENOENT ) {