diff --git a/ChangeLog b/ChangeLog
index 906b79e3..0c0f0a88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-13  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* lib/sgetspent.c: Use SHADOW_SP_FLAG_UNSET for the initial
+	value of spwd.sp_flag.
+
 2008-06-13  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* lib/getdef.h, lib/getdef.c: Add getdef_ulong().
diff --git a/lib/sgetspent.c b/lib/sgetspent.c
index be55e77d..d31f2ede 100644
--- a/lib/sgetspent.c
+++ b/lib/sgetspent.c
@@ -147,7 +147,7 @@ struct spwd *sgetspent (const char *string)
 		spwd.sp_warn   = -1;
 		spwd.sp_inact  = -1;
 		spwd.sp_expire = -1;
-		spwd.sp_flag   = -1;
+		spwd.sp_flag   = SHADOW_SP_FLAG_UNSET;
 
 		return &spwd;
 	}
@@ -200,7 +200,7 @@ struct spwd *sgetspent (const char *string)
 	if ((0 == spwd.sp_flag) && ('\0' != *cpp)) {
 		return 0;
 	} else if (fields[8][0] == '\0') {
-		spwd.sp_flag = -1;
+		spwd.sp_flag = SHADOW_SP_FLAG_UNSET;
 	}
 
 	return (&spwd);