diff --git a/kbx/keybox-blob.c b/kbx/keybox-blob.c
index 8ac67afbe..7e4dcfaaa 100644
--- a/kbx/keybox-blob.c
+++ b/kbx/keybox-blob.c
@@ -1102,7 +1102,7 @@ _keybox_update_header_blob (KEYBOXBLOB blob, int for_openpgp)
     {
       u32 val = make_timestamp ();
 
-      /* Update the last maintenance run times tamp. */
+      /* Update the last maintenance run timestamp. */
       blob->blob[20]   = (val >> 24);
       blob->blob[20+1] = (val >> 16);
       blob->blob[20+2] = (val >>  8);
diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c
index e09fefc41..66430c848 100644
--- a/kbx/keybox-update.c
+++ b/kbx/keybox-update.c
@@ -675,7 +675,7 @@ keybox_compress (KEYBOX_HANDLE hd)
         {
           u32 last_maint = buf32_to_u32 (buffer+20);
 
-          if ( (last_maint + 3*3600) > time (NULL) )
+          if ( (last_maint + 3*3600) < make_timestamp () )
             {
               fclose (fp);
               _keybox_release_blob (blob);