diff --git a/lib/isexpired.c b/lib/isexpired.c
index b30dcdce..be137c7a 100644
--- a/lib/isexpired.c
+++ b/lib/isexpired.c
@@ -82,13 +82,11 @@ int isexpired (const struct passwd *pw, /*@null@*/const struct spwd *sp)
 
 	/*
 	 * The last and max fields must be present for an account
-	 * to have an expired password.  A maximum of >10000 days
-	 * is considered to be infinite.
+	 * to have an expired password.
 	 */
 
 	if (   (-1 == sp->sp_lstchg)
-	    || (-1 == sp->sp_max)
-	    || (sp->sp_max >= 10000)) {
+	    || (-1 == sp->sp_max)) {
 		return 0;
 	}
 
diff --git a/src/chage.c b/src/chage.c
index 54f64eb0..419c1723 100644
--- a/src/chage.c
+++ b/src/chage.c
@@ -286,7 +286,6 @@ static void list_fields (void)
 	if (lstchgdate == 0) {
 		(void) puts (_("password must be changed"));
 	} else if (   (lstchgdate < 0)
-	           || (maxdays >= 10000)
 	           || (maxdays < 0)
 	           || (LONG_MAX - lstchgdate < maxdays))
 	{
@@ -306,7 +305,6 @@ static void list_fields (void)
 		(void) puts (_("password must be changed"));
 	} else if (   (lstchgdate < 0)
 	           || (inactdays < 0)
-	           || (maxdays >= 10000)
 	           || (maxdays < 0)
 	           || (LONG_MAX - inactdays < maxdays)
 	           || (LONG_MAX - lstchgdate < maxdays + inactdays))