--- util-linux-2.21/include/pathnames.h~	2011-12-18 22:28:28.000000000 +0200
+++ util-linux-2.21/include/pathnames.h	2012-03-05 17:32:49.986673893 +0200
@@ -35,7 +35,7 @@
 # define _PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 #endif
 
-#define _PATH_WTMPLOCK		"/etc/wtmplock"
+#define _PATH_WTMPLOCK		"/var/lock/wtmplock"
 
 #define	_PATH_HUSHLOGIN		".hushlogin"
 #define	_PATH_HUSHLOGINS	"/etc/hushlogins"
@@ -34,7 +34,7 @@
 #define _PATH_NOLOGIN_TXT	"/etc/nologin.txt"
 
 #ifndef _PATH_MAILDIR
-#define	_PATH_MAILDIR		"/var/spool/mail"
+#define	_PATH_MAILDIR		"/var/mail"
 #endif
 #define	_PATH_MOTDFILE		"/etc/motd"
 #define	_PATH_NOLOGIN		"/etc/nologin"
--- util-linux-2.21/login-utils/login.1~	2012-02-10 15:45:52.000000000 +0200
+++ util-linux-2.21/login-utils/login.1	2012-03-05 18:07:04.386917212 +0200
@@ -223,7 +223,7 @@
 .I /var/run/utmp
 .I /var/log/wtmp
 .I /var/log/lastlog
-.I /var/spool/mail/*
+.I /var/mail/*
 .I /etc/motd
 .I /etc/passwd
 .I /etc/nologin