diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index dd49064c..5b82955f 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-04  Theodore Ts'o  <tytso@mit.edu>
+
+	* unix.c (check_if_skip): If the checkinterval is zero, then
+		disregard it when calculating when the next check will
+		take place.
+
 2004-04-12  Theodore Ts'o  <tytso@mit.edu>
 
 	* unix.c (is_on_batt): Be more flexible about the name of the ACPI
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 0f9f6963..43ef4c93 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -298,7 +298,8 @@ static void check_if_skip(e2fsck_t ctx)
 		if (next_check <= 0) 
 			next_check = 1;
 	}
-	if ((now - fs->super->s_lastcheck) >= fs->super->s_checkinterval)
+	if (fs->super->s_checkinterval &&
+	    ((now - fs->super->s_lastcheck) >= fs->super->s_checkinterval))
 		next_check = 1;
 	if (next_check <= 5) {
 		if (next_check == 1)