diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in
index bbc9366a0..e4dd16d88 100644
--- a/appl/ftp/ftpd/Makefile.in
+++ b/appl/ftp/ftpd/Makefile.in
@@ -6,6 +6,8 @@ srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 VPATH		= @srcdir@
 
+topdir		= ../../..
+
 SHELL		= /bin/sh
 
 CC 	= @CC@
@@ -30,7 +32,7 @@ INCTOP = $(ATHENA)/include
 
 LIBTOP = $(ATHENA)/lib
 
-LIBKAFS = -L$(LIBTOP)/kafs -lkafs
+LIBKAFS = @KRB_KAFS_LIB@
 LIBKRB	= -L$(LIBTOP)/krb -lkrb
 LIBDES	= -L$(LIBTOP)/des -ldes
 LIBROKEN= $(LIBTOP)/roken/libroken.a
diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in
index c1db43bb1..58019a193 100644
--- a/appl/telnet/telnetd/Makefile.in
+++ b/appl/telnet/telnetd/Makefile.in
@@ -4,6 +4,8 @@ srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 VPATH		= @srcdir@
 
+topdir		= ../../..
+
 SHELL		= /bin/sh
 
 CC = @CC@
@@ -35,7 +37,7 @@ libtop = @libtop@
 
 LIBKRB		= -L../../../lib/krb -lkrb
 LIBDES		= -L../../../lib/des -ldes
-LIBKAFS		= -L../../../lib/kafs -lkafs
+LIBKAFS		= @KRB_KAFS_LIB@
 LIBROKEN	= -L../../../lib/roken -lroken
 
 KLIB=$(LIBKAFS) $(LIBKRB) $(LIBDES) $(LIBROKEN)
diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in
index 2a2c5939d..84e7def71 100644
--- a/appl/xnlock/Makefile.in
+++ b/appl/xnlock/Makefile.in
@@ -3,6 +3,8 @@ SHELL = /bin/sh
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+topdir = ../..
+
 XINCS = @X_CFLAGS@
 XLIBS = @X_LIBS@ -lXt @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
 
@@ -70,6 +72,6 @@ dist: $(DISTFILES)
 
 
 xnlock: xnlock.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o -L../../lib/kafs -lkafs -L../../lib/krb -lkrb -L../../lib/des -ldes -L../../lib/roken -lroken $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ -L../../lib/krb -lkrb -L../../lib/des -ldes -L../../lib/roken -lroken $(LIBS)
 
 $(OBJECTS): ../../config.h