diff --git a/src/ChangeLog b/src/ChangeLog
index 641011200..6f0c02ba5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-30  Pavel Roskin  <proski@gnu.org>
+
+	* Makefile.am: Rename LIBDIR to SAVERDIR to avoid confusion.
+	Change its value to match the installation path of cons.saver.
+	* cons.handler.c: Adjust for the above.
+
 2006-01-30  Pavel Tsekov  <ptsekov@gmx.net>
 
 	* boxes.c: Do not set the field `histname' of `QuickWidget'
@@ -68,7 +74,7 @@
 
 2006-01-23  Egmont Koblinger  <egmont@uhulinux.hu>
 
-        * subshell.c: restart write() calls interrupted by sigchld which lead
+	* subshell.c: restart write() calls interrupted by sigchld which lead
 	to some bytes being swallowed from the subshell's output.
 
 2006-01-07  Roland Illig  <roland.illig@gmx.de>
diff --git a/src/Makefile.am b/src/Makefile.am
index 89655f5ba..c4ccbd4a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = mc mcmfmt
 if CONS_SAVER
 pkglibexec_PROGRAMS = cons.saver
 AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \
-	-DLIBDIR=\""$(pkglibdir)"\"
+	-DSAVERDIR=\""$(pkglibexecdir)"\"
 else
 AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
 endif
diff --git a/src/cons.handler.c b/src/cons.handler.c
index 9528c320e..1975d05be 100644
--- a/src/cons.handler.c
+++ b/src/cons.handler.c
@@ -142,7 +142,7 @@ handle_console_linux (unsigned char action)
 	    open ("/dev/null", O_WRONLY);
 	    if (tty_name) {
 		/* Exec the console save/restore handler */
-		mc_conssaver = concat_dir_and_file (LIBDIR, "cons.saver");
+		mc_conssaver = concat_dir_and_file (SAVERDIR, "cons.saver");
 		execl (mc_conssaver, "cons.saver", tty_name, (char *) NULL);
 	    }
 	    /* Console is not a tty or execl() failed */