diff --git a/configure.ac b/configure.ac
index b3dd34d96d..e661530521 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,10 +21,6 @@ AC_SUBST([LIBSUBID_ABI_MINOR], [libsubid_abi_minor])
 AC_SUBST([LIBSUBID_ABI_MICRO], [libsubid_abi_micro])
 AC_SUBST([LIBSUBID_ABI], [libsubid_abi])
 
-dnl Some hacks...
-test "x$prefix" = "xNONE" && prefix="/usr"
-test "X$prefix" = "X/usr" && exec_prefix=""
-
 AC_USE_SYSTEM_EXTENSIONS
 
 AC_ENABLE_STATIC
@@ -103,9 +99,6 @@ done])
 AC_DEFINE_UNQUOTED([FAILLOG_FILE], ["$shadow_cv_logdir/faillog"],
 	[Path for faillog file.])
 
-AC_DEFINE_UNQUOTED([PASSWD_PROGRAM], ["$exec_prefix/bin/passwd"],
-	[Path to passwd program.])
-
 AC_ARG_ENABLE([shadowgrp],
 	[AS_HELP_STRING([--enable-shadowgrp], [enable shadow group support @<:@default=yes@:>@])],
 	[case "${enableval}" in
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c402ff02a3..4a6a223e7a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,8 @@
 
 AUTOMAKE_OPTIONS = 1.0 foreign
 
-DEFS =
+DEFS = \
+	-DPATH_PASSWD='"$(bindir)/passwd"'
 
 noinst_LTLIBRARIES = libshadow.la
 
diff --git a/lib/age.c b/lib/age.c
index bdb789e30d..a0a12e6261 100644
--- a/lib/age.c
+++ b/lib/age.c
@@ -23,11 +23,11 @@
 #include "shadow/gshadow/endsgent.h"
 
 
-#ident "$Id$"
-
-#ifndef PASSWD_PROGRAM
-#define PASSWD_PROGRAM "/bin/passwd"
+#ifndef PATH_PASSWD
+#define PATH_PASSWD "/bin/passwd"
 #endif
+
+
 /*
  * expire - force password change if password expired
  *
@@ -116,9 +116,9 @@ int expire (const struct passwd *pw, /*@null@*/const struct spwd *sp)
 			_exit (126);
 		}
 
-		(void) execl (PASSWD_PROGRAM, PASSWD_PROGRAM, pw->pw_name, (char *) NULL);
+		(void) execl(PATH_PASSWD, PATH_PASSWD, pw->pw_name, (char *) NULL);
 		err = errno;
-		perror ("Can't execute " PASSWD_PROGRAM);
+		perror("Can't execute " PATH_PASSWD);
 		_exit ((ENOENT == err) ? E_CMD_NOTFOUND : E_CMD_NOEXEC);
 	} else if ((pid_t) -1 == pid) {
 		perror ("fork");
diff --git a/src/Makefile.am b/src/Makefile.am
index 6981815095..8de268cfe5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,13 +2,13 @@
 EXTRA_DIST = \
 	.indent.pro
 
-ubindir = ${prefix}/bin
-usbindir = ${prefix}/sbin
+ubindir = $(exec_prefix)/bin
+usbindir = $(exec_prefix)/sbin
 suidperms = 4755
 sgidperms = 2755
 
 AM_CPPFLAGS = \
-	-I${top_srcdir}/lib \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir) \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(ECONF_CPPFLAGS)
@@ -24,7 +24,7 @@ AM_CFLAGS = $(LIBBSD_CFLAGS)
 #
 # also /lib/libshadow.so.x.xx (if any) could be moved to /usr/lib
 # and installation would be much simpler (just two directories,
-# $prefix/bin and $prefix/sbin, no install-data hacks...)
+# $exec_prefix/bin and $exec_prefix/sbin, no install-data hacks...)
 
 bin_PROGRAMS   = login
 sbin_PROGRAMS  = nologin