diff -urN util-linux-2.11d.org/lib/pathnames.h util-linux-2.11d/lib/pathnames.h
--- util-linux-2.11d.org/lib/pathnames.h	Sun Jun  3 21:48:00 2001
+++ util-linux-2.11d/lib/pathnames.h	Sun Jun  3 21:48:47 2001
@@ -86,6 +86,10 @@
 #define LOGDIR                  "/var/log"
 #endif
 
+#ifndef DATAMISCDIR
+#define DATAMISCDIR              "/usr/share/misc"
+#endif
+
 #ifndef VARPATH
 #define VARPATH			"/var"
 #endif
@@ -101,7 +105,7 @@
 #define SECURETTY       	"/etc/securetty"
 #define _PATH_UTMP      	"/var/run/utmpx"
 #define _PATH_WTMP      	LOGDIR "/wtmpx"
-#define _PATH_WTMPLOCK		"/etc/wtmplock"
+#define _PATH_WTMPLOCK		VARPATH "/lock/wtmplock"
 
 /* no more . in DEFPATH */
 #define	_PATH_DEFPATH	        "/usr/local/bin:/bin:/usr/bin"
@@ -110,7 +114,7 @@
 #define	_PATH_LASTLOG		LOGDIR "/lastlog"
 
 #ifndef _PATH_MAILDIR
-#define	_PATH_MAILDIR		VARPATH "/spool/mail"
+#define	_PATH_MAILDIR		VARPATH "/mail"
 #endif
 #define	_PATH_MOTDFILE		"/etc/motd"
 #define	_PATH_NOLOGIN		"/etc/nologin"