diff -Naur openafs-1.6.0-lunar/src/kauth/Makefile.in openafs-1.6.0/src/kauth/Makefile.in
--- openafs-1.6.0-lunar/src/kauth/Makefile.in	2011-08-16 14:26:14.000000000 +0200
+++ openafs-1.6.0/src/kauth/Makefile.in	2011-11-05 17:04:21.651566055 +0100
@@ -262,7 +262,7 @@
 	${INSTALL_PROGRAM} klog ${DESTDIR}${afssrvbindir}/klog
 	${INSTALL_PROGRAM} klog.krb ${DESTDIR}${afssrvbindir}/klog.krb
 	${INSTALL_PROGRAM} knfs ${DESTDIR}${bindir}/knfs
-	${INSTALL_PROGRAM} kpasswd ${DESTDIR}${bindir}/kpasswd
+	${INSTALL_PROGRAM} kpasswd ${DESTDIR}${bindir}/kpasswd.afs
 	${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${bindir}/kpwvalid
 	${INSTALL_DATA} libkauth.a ${DESTDIR}${libdir}/afs/libkauth.a
 	${INSTALL_DATA} libkauth.krb.a ${DESTDIR}${libdir}/afs/libkauth.krb.a
@@ -291,7 +291,7 @@
 	${INSTALL_PROGRAM} klog ${DEST}/root.server/usr/afs/bin/klog
 	${INSTALL_PROGRAM} klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb
 	${INSTALL_PROGRAM} knfs ${DEST}/bin/knfs
-	${INSTALL_PROGRAM} kpasswd ${DEST}/bin/kpasswd
+	${INSTALL_PROGRAM} kpasswd ${DEST}/bin/kpasswd.afs
 	${INSTALL_PROGRAM} kpwvalid ${DEST}/bin/kpwvalid
 	${INSTALL_DATA} libkauth.a ${DEST}/lib/afs/libkauth.a
 	${INSTALL_DATA} libkauth.krb.a ${DEST}/lib/afs/libkauth.krb.a