diff -Naur openafs-1.4.7-lunar/src/kauth/Makefile.in openafs-1.4.7/src/kauth/Makefile.in
--- openafs-1.4.7-lunar/src/kauth/Makefile.in	2007-11-12 19:31:34.000000000 +0100
+++ openafs-1.4.7/src/kauth/Makefile.in	2008-05-04 15:12:14.000000000 +0200
@@ -52,7 +52,7 @@
 KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o
 
 
-all: kaserver kas kpwvalid klog klog.krb knfs kpasswd rebuild kdb ka-forwarder \
+all: kaserver kas kpwvalid klog klog.krb knfs kpasswd.afs rebuild kdb ka-forwarder \
 	${TOP_LIBDIR}/libkauth.a \
 	${TOP_LIBDIR}/libkauth.krb.a \
 	depinstall
@@ -175,8 +175,8 @@
 kpasswd.o: kauth.h kautils.h ${INCLS} kpasswd.c AFS_component_version_number.o
 	${CC} ${CFLAGS} -c ${srcdir}/kpasswd.c 
 
-kpasswd: kauth.h kautils.h libkauth.a $(LIBS) kpasswd.o kkids.o
-	${CC} ${LDFLAGS} -o kpasswd kpasswd.o kkids.o libkauth.a ${LIBS} ${XLIBS}
+kpasswd.afs: kauth.h kautils.h libkauth.a $(LIBS) kpasswd.o kkids.o
+	${CC} ${LDFLAGS} -o kpasswd.afs kpasswd.o kkids.o libkauth.a ${LIBS} ${XLIBS}
 
 kpwvalid.o: kpwvalid.c AFS_component_version_number.o
 	${CC} ${CFLAGS} -c ${srcdir}/kpwvalid.c
@@ -237,7 +237,7 @@
 	${DESTDIR}${afssrvbindir}/klog \
 	${DESTDIR}${afssrvbindir}/klog.krb \
 	${DESTDIR}${bindir}/knfs \
-	${DESTDIR}${bindir}/kpasswd \
+	${DESTDIR}${bindir}/kpasswd.afs \
 	${DESTDIR}${bindir}/kpwvalid \
 	${DESTDIR}${libdir}/afs/libkauth.a \
 	${DESTDIR}${libdir}/afs/libkauth.krb.a \
@@ -278,7 +278,7 @@
 ${DESTDIR}${bindir}/knfs: knfs
 	${INSTALL} $? $@
 
-${DESTDIR}${bindir}/kpasswd: kpasswd
+${DESTDIR}${bindir}/kpasswd.afs: kpasswd.afs
 	${INSTALL} $? $@
 
 ${DESTDIR}${bindir}/kpwvalid: kpwvalid
@@ -319,7 +319,7 @@
 	${DEST}/root.server/usr/afs/bin/klog \
 	${DEST}/root.server/usr/afs/bin/klog.krb \
 	${DEST}/bin/knfs \
-	${DEST}/bin/kpasswd \
+	${DEST}/bin/kpasswd.afs \
 	${DEST}/bin/kpwvalid \
 	${DEST}/lib/afs/libkauth.a \
 	${DEST}/lib/afs/libkauth.krb.a \
@@ -348,7 +348,7 @@
 ${DEST}/bin/knfs: knfs 
 	${INSTALL} $? $@
 
-${DEST}/bin/kpasswd: kpasswd 
+${DEST}/bin/kpasswd.afs: kpasswd.afs
 	${INSTALL} $? $@
 
 ${DEST}/lib/afs/libkauth.a: libkauth.a 
@@ -382,7 +382,7 @@
 
 clean:
 	$(RM) -f *.o *.a *.xdr.c *.cs.c *.ss.c core \
-		kaserver kas klog multiklog kpasswd klogin rebuild \
+		kaserver kas klog multiklog kpasswd.afs klogin rebuild \
 		kauth.h kautils.h kaerrors.c kpwvalid AFS_component_version_number.c \
 		klog.krb knfs klogin.krb kdb Kkauth.h