diff --git a/ChangeLog b/ChangeLog
index 2e0df528..56add6ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-18  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/pwck.c: Unlock the password and shadow files when there is a
+	failure to prepare the update in memory.
+
 2010-03-18  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/pwck.c: Only log to SYSLOG when acting on system files.
diff --git a/src/pwck.c b/src/pwck.c
index dafa5819..316797f1 100644
--- a/src/pwck.c
+++ b/src/pwck.c
@@ -590,7 +590,7 @@ static void check_pw_file (int *errors, bool *changed)
 						fprintf (stderr,
 						         _("%s: failed to prepare the new %s entry '%s'\n"),
 						         Prog, spw_dbname (), sp.sp_namp);
-						exit (E_CANTUPDATE);
+						fail_exit (E_CANTUPDATE);
 					}
 					/* remove password from /etc/passwd */
 					pw = *pwd;