diff --git a/lisp/epa-ks.el b/lisp/epa-ks.el
index 83c8bc38b26..e0504371e0d 100644
--- a/lisp/epa-ks.el
+++ b/lisp/epa-ks.el
@@ -194,7 +194,7 @@ KEYS is a list of `epa-ks-key' structures, as parsed by
                        (if (epa-ks-key-expires key)
                            (let* ((date (epa-ks-key-expires key))
                                   (str (format-time-string "%F" date)))
-                             (when (< 0 (time-to-seconds (time-since date)))
+			     (when (time-less-p date nil)
                                (setq str (propertize str 'face
                                                      'font-lock-warning-face)))
                              str)