diff --git a/g10/keygen.c b/g10/keygen.c
index 7f15027a2..b48a79006 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -5608,7 +5608,6 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
         {
           int no_enc_rsa;
           PKT_public_key *pk;
-          char hexfpr[2*MAX_FINGERPRINT_LEN + 1];
 
           no_enc_rsa = ((get_parameter_algo (ctrl, para, pKEYTYPE, NULL)
                          == PUBKEY_ALGO_RSA)
@@ -5618,8 +5617,7 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
 
           pk = find_kbnode (pub_root, PKT_PUBLIC_KEY)->pkt->pkt.public_key;
 
-          hexfingerprint (pk, hexfpr, sizeof hexfpr);
-          register_trusted_key (hexfpr);
+          update_ownertrust (ctrl, pk, TRUST_ULTIMATE);
 
           if (!opt.flags.no_auto_trust_new_key)
             update_ownertrust (ctrl, pk,