diff --git a/ChangeLog b/ChangeLog
index 41cad419..f4672ac4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2010-08-21  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* configure.in: Fixed typo.
+
+2010-08-21  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* libmisc/console.c, libmisc/motd.c, libmisc/setupenv.c,
+	libmisc/sulog.c, libmisc/hushed.c, libmisc/failure.c,
+	libmisc/loginprompt.c, libmisc/ttytype.c,
+	libmisc/pam_pass_non_interractive.c, src/userdel.c, src/login.c,
+	lib/commonio.c, lib/commonio.h: Fix some const issues.
+	* libmisc/motd.c: Avoid multi-statements lines.
+	* libmisc/motd.c: Support long MOTD_FILE.
+	* libmisc/list.c, lib/prototypes.h: Revert previous change.
+	dup_list and is_on_list are used with members as defined for the
+	group structure, and thus even if the list is not modified, the
+	list elements cannot be constant strings.
+	* libmisc/system.c: Avoid C++ comments.
+	* src/vipw.c: WITH_TCB cannot be tested inside a gettextized
+	string. Split the Usage string.
+	* lib/commonio.h: Re-indent.
+
 2010-08-21  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* libmisc/audit_help.c (audit_logger):pgname is not used. We let
diff --git a/configure.in b/configure.in
index 68666b01..b79073fc 100644
--- a/configure.in
+++ b/configure.in
@@ -370,7 +370,7 @@ if test "$with_attr" != "no"; then
 		else
 			AC_DEFINE(WITH_ATTR, 1,
 			          [Build shadow with Extended Attributes support])
-			LIBACL="-lattr"
+			LIBATTR="-lattr"
 			with_attr="yes"
 		fi
 	else