diff --git a/g10/trustdb.c b/g10/trustdb.c
index 78d0c7a5a..98e9e35a1 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -217,7 +217,8 @@ tdb_register_trusted_key (const char *string)
           register_trusted_keyid (desc.u.kid);
           return;
         }
-      if (desc.mode == KEYDB_SEARCH_MODE_FPR)
+      if (desc.mode == KEYDB_SEARCH_MODE_FPR
+          || desc.mode == KEYDB_SEARCH_MODE_FPR20)
         {
           kid[0] = buf32_to_u32 (desc.u.fpr+12);
           kid[1] = buf32_to_u32 (desc.u.fpr+16);