diff --git a/configure.ac b/configure.ac
index c01264c004..e2bcf4b87e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,9 +97,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 7c488f8266..b8802fd687 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");