diff --git a/g10/gpg.c b/g10/gpg.c
index 5a880fd53..654dcb99b 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3949,6 +3949,11 @@ main (int argc, char **argv)
       case aListTrustDB:
         rc = setup_trustdb (argc? 1:0, trustdb_name);
         break;
+      case aKeygen:
+      case aFullKeygen:
+      case aQuickKeygen:
+        rc = setup_trustdb (1, trustdb_name);
+        break;
       default:
         /* If we are using TM_ALWAYS, we do not need to create the
            trustdb.  */
diff --git a/g10/keygen.c b/g10/keygen.c
index f044257ed..201ebaa42 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4791,9 +4791,8 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
           keyid_from_pk (pk, pk->main_keyid);
           register_trusted_keyid (pk->main_keyid);
 
-	  if (have_trustdb ())
-	    update_ownertrust (pk, ((get_ownertrust (pk) & ~TRUST_MASK)
-				    | TRUST_ULTIMATE ));
+	  update_ownertrust (pk, ((get_ownertrust (pk) & ~TRUST_MASK)
+				  | TRUST_ULTIMATE ));
 
           gen_standard_revoke (pk, cache_nonce);