diff --git a/src/util.cpp b/src/util.cpp
index c6401c4e9..bdfc5cf6a 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -164,13 +164,13 @@ std::string formatSeconds (time_t delta)
   char formatted[24];
   float days = (float) delta / 86400.0;
 
-  if (days >= 365)
-    sprintf (formatted, "%.1f yrs", (days / 365.2422));   // TODO i18n
-  else if (days > 84)
+  if (delta >= 86400 * 365)
+    sprintf (formatted, "%.1f yrs", (days / 365));   // TODO i18n
+  else if (delta > 86400 * 84)
     sprintf (formatted, "%1d mth%s",   // TODO i18n
                         (int) (days / 30.6),
                         ((int) (days / 30.6) == 1 ? "" : "s"));   // TODO i18n
-  else if (days > 13)
+  else if (delta > 86400 * 13)
     sprintf (formatted, "%d wk%s",   // TODO i18n
                         (int) (days / 7.0),
                         ((int) (days / 7.0) == 1 ? "" : "s"));   // TODO i18n
@@ -203,14 +203,14 @@ std::string formatSecondsCompact (time_t delta)
   char formatted[24];
   float days = (float) delta / 86400.0;
 
-       if (days >= 365)    sprintf (formatted, "%.1fy", (days / 365.2422));    // TODO i18n
-  else if (days > 84)      sprintf (formatted, "%1dmo", (int) (days / 30.6));  // TODO i18n
-  else if (days > 13)      sprintf (formatted, "%dwk",  (int) (days / 7.0));   // TODO i18n
-  else if (delta >= 86400) sprintf (formatted, "%dd",   (int) days);           // TODO i18n
-  else if (delta >= 3600)  sprintf (formatted, "%dh",   (int) (delta / 3600)); // TODO i18n
-  else if (delta >= 60)    sprintf (formatted, "%dm",   (int) (delta / 60));   // TODO i18n
-  else if (delta >= 1)     sprintf (formatted, "%ds",   (int) delta);          // TODO i18n
-  else                     strcpy (formatted, "-");
+       if (delta >= 86400 * 365) sprintf (formatted, "%.1fy", (days / 365));    // TODO i18n
+  else if (delta >= 86400 * 84)  sprintf (formatted, "%1dmo", (int) (days / 30.6));  // TODO i18n
+  else if (delta >= 86400 * 13)  sprintf (formatted, "%dwk",  (int) (days / 7.0));   // TODO i18n
+  else if (delta >= 86400)       sprintf (formatted, "%dd",   (int) days);           // TODO i18n
+  else if (delta >= 3600)        sprintf (formatted, "%dh",   (int) (delta / 3600)); // TODO i18n
+  else if (delta >= 60)          sprintf (formatted, "%dm",   (int) (delta / 60));   // TODO i18n
+  else if (delta >= 1)           sprintf (formatted, "%ds",   (int) delta);          // TODO i18n
+  else                           strcpy (formatted, "-");
 
   return std::string (formatted);
 }