diff --git a/appl/ftp/configure b/appl/ftp/configure
index e9003e09b..49f8dc5c8 100755
--- a/appl/ftp/configure
+++ b/appl/ftp/configure
@@ -786,7 +786,13 @@ echo "$ac_t""$ac_cv_c_cross" 1>&6
 cross_compiling=$ac_cv_c_cross
 
 
-
+if eval "test \"`echo '$''{'krb_cv_ld_flags'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  krb_cv_ld_flags=""
+fi
+ LD_FLAGS=${krb_cv_ld_flags}
+   
 for ac_hdr in sys/select.h paths.h bsd/bsd.h
 do
 ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
@@ -795,12 +801,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 799 "configure"
+#line 805 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -840,7 +846,7 @@ if eval "test \"\$ac_cv_func_socket\" != yes" ; then
 			LIBS="$ac_lib $ac_save_LIBS"
 		fi
 		cat > conftest.$ac_ext <<EOF
-#line 844 "configure"
+#line 850 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -848,7 +854,7 @@ int t() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
 fi
@@ -918,7 +924,7 @@ if eval "test \"\$ac_cv_func_gethostbyname\" != yes" ; then
 			LIBS="$ac_lib $ac_save_LIBS"
 		fi
 		cat > conftest.$ac_ext <<EOF
-#line 922 "configure"
+#line 928 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -926,7 +932,7 @@ int t() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
 fi
@@ -988,7 +994,7 @@ if eval "test \"`echo '$''{'ac_cv_struct_ut_host'+set}'`\" = set"; then
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 992 "configure"
+#line 998 "configure"
 #include "confdefs.h"
 
 #include <time.h>
@@ -1003,7 +1009,7 @@ p = ut.ut_host;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_ut_host=yes
 else
@@ -1031,7 +1037,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1035 "configure"
+#line 1041 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1053,7 +1059,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1088,7 +1094,7 @@ if test "$cross_compiling" = yes; then
   :
 else
 cat > conftest.$ac_ext <<EOF
-#line 1092 "configure"
+#line 1098 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -1110,7 +1116,7 @@ int main()
 }
 
 EOF
-{ (eval echo configure:1114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_func_getcwd_broken=yes
 else
@@ -1137,7 +1143,7 @@ if eval "test \"`echo '$''{'ac_cv_var___progname'+set}'`\" = set"; then
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 1141 "configure"
+#line 1147 "configure"
 #include "confdefs.h"
 extern char *__progname;
 int main() { return 0; }
@@ -1145,7 +1151,7 @@ int t() {
 return strlen(__progname);
 ; return 0; }
 EOF
-if { (eval echo configure:1149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   ac_cv_var___progname=yes
 else
@@ -1285,6 +1291,7 @@ s%@CC@%$CC%g
 s%@RANLIB@%$RANLIB%g
 s%@CPP@%$CPP%g
 s%@YACC@%$YACC%g
+s%@LD_FLAGS@%$LD_FLAGS%g
 
 CEOF
 EOF
diff --git a/appl/ftp/configure.in b/appl/ftp/configure.in
index 095987602..372089299 100644
--- a/appl/ftp/configure.in
+++ b/appl/ftp/configure.in
@@ -18,8 +18,12 @@ AC_PROG_YACC
 
 AC_C_CROSS
 
-AC_SUBST(CFLAGS)dnl
-AC_SUBST(LDFLAGS)dnl
+AC_CACHE_VAL(krb_cv_ld_flags,
+krb_cv_ld_flags="") dnl
+LD_FLAGS=${krb_cv_ld_flags}
+AC_SUBST(CFLAGS) dnl
+AC_SUBST(LDFLAGS) dnl
+AC_SUBST(LD_FLAGS) dnl
 
 AC_CHECK_HEADERS(sys/select.h paths.h bsd/bsd.h)
 
diff --git a/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in
index c0b118745..015d0083d 100644
--- a/appl/ftp/ftp/Makefile.in
+++ b/appl/ftp/ftp/Makefile.in
@@ -10,6 +10,7 @@ CC 	= @CC@
 RANLIB 	= @RANLIB@
 DEFS 	= @DEFS@
 CFLAGS 	= @CFLAGS@
+LD_FLAGS = @LD_FLAGS@
 LIBS = @LIBS@
 
 INSTALL = @INSTALL@
@@ -35,7 +36,7 @@ install:
 
 
 ftp: $(ftp_OBJS) ../common/libcommon.a
-	$(CC) -o ftp $(ftp_OBJS) ../common/libcommon.a -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o ftp $(ftp_OBJS) ../common/libcommon.a -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS)
 
 clean cleandir:
 	rm -f *~ *.o core ftp \#*
diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in
index 81607dcae..33866d3c8 100644
--- a/appl/ftp/ftpd/Makefile.in
+++ b/appl/ftp/ftpd/Makefile.in
@@ -11,6 +11,7 @@ YACC	= @YACC@
 RANLIB 	= @RANLIB@
 DEFS 	= @DEFS@
 CFLAGS 	= @CFLAGS@
+LD_FLAGS = @LD_FLAGS@
 LIBS	= @LIBS@
 
 INSTALL = @INSTALL@
@@ -36,7 +37,7 @@ install:
 
 
 ftpd: $(ftpd_OBJS)
-	$(CC) -o ftpd $(ftpd_OBJS) ../common/libcommon.a -L$(LIBTOP)/kafs -lkafs -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o ftpd $(ftpd_OBJS) ../common/libcommon.a -L$(LIBTOP)/kafs -lkafs -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS)
 
 ftpcmd.c: ftpcmd.y
 	$(YACC) $(YFLAGS) $<
diff --git a/appl/kx/Makefile.in b/appl/kx/Makefile.in
index 7a84dfa71..493bd9842 100644
--- a/appl/kx/Makefile.in
+++ b/appl/kx/Makefile.in
@@ -7,6 +7,7 @@ CC = @CC@
 AR = ar
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
+LD_FLAGS = @LD_FLAGS@
 INSTALL = @INSTALL@
 LIBS = @LIBS@
 MKDIRHIER = @top_srcdir@/mkdirhier-sh
@@ -69,9 +70,9 @@ dist: $(DISTFILES)
 	done
 
 kx: $(OBJECTS_KX)
-	$(CC) $(LDFLAGS) -o $@ $(OBJECTS_KX) -L../../lib/krb -lkrb -L../../lib/des -ldes $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KX) -L../../lib/krb -lkrb -L../../lib/des -ldes $(LIBS)
 
 kxd: $(OBJECTS_KXD)
-	$(CC) $(LDFLAGS) -o $@ $(OBJECTS_KXD) -L../../lib/krb -lkrb -L../../lib/des -ldes $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KXD) -L../../lib/krb -lkrb -L../../lib/des -ldes $(LIBS)
 
 $(OBJECTS): ../../config.h
diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in
index eb85e00c4..da7b333ba 100644
--- a/appl/popper/Makefile.in
+++ b/appl/popper/Makefile.in
@@ -9,6 +9,7 @@ AR = ar
 RANLIB = @RANLIB@
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
+LD_FLAGS = @LD_FLAGS@
 INSTALL = @INSTALL@
 LIBS = @LIBS@
 MKDIRHIER = @top_srcdir@/mkdirhier-sh
@@ -40,7 +41,7 @@ all: $(PROGS)
 
 Wall:
 	make CFLAGS="-g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-		
+
 .c.o:
 	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $<
 
@@ -74,6 +75,6 @@ dist: $(DISTFILES)
 	done
 
 kpopper: $(OBJECTS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) -L../../lib/krb -lkrb -L../../lib/des -ldes $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../../lib/krb -lkrb -L../../lib/des -ldes $(LIBS)
 
 $(OBJECTS): ../../config.h
diff --git a/appl/telnet/configure b/appl/telnet/configure
index dafbb15a4..82befe22d 100755
--- a/appl/telnet/configure
+++ b/appl/telnet/configure
@@ -741,7 +741,13 @@ echo "$ac_t""$CPP" 1>&6
 # If we're using gcc and the user hasn't specified CFLAGS, add -O to CFLAGS.
 test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O"
 
-
+if eval "test \"`echo '$''{'krb_cv_ld_flags'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  krb_cv_ld_flags=""
+fi
+ LD_FLAGS=${krb_cv_ld_flags}
+   
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -826,7 +832,7 @@ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 830 "configure"
+#line 836 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -844,7 +850,7 @@ int t() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -867,7 +873,7 @@ if eval "test \"`echo '$''{'krb_cv_sys_nextstep'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 871 "configure"
+#line 877 "configure"
 #include "confdefs.h"
 #ifdef NeXT
 	yes
@@ -1152,7 +1158,7 @@ if eval "test \"\$ac_cv_func_tgetent\" != yes" ; then
 			LIBS="$ac_lib $ac_save_LIBS"
 		fi
 		cat > conftest.$ac_ext <<EOF
-#line 1156 "configure"
+#line 1162 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1160,7 +1166,7 @@ int t() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:1164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_tgetent=$ac_lib; else ac_cv_funclib_tgetent=yes; fi";break
 fi
@@ -1230,7 +1236,7 @@ if eval "test \"\$ac_cv_func_setupterm\" != yes" ; then
 			LIBS="$ac_lib $ac_save_LIBS"
 		fi
 		cat > conftest.$ac_ext <<EOF
-#line 1234 "configure"
+#line 1240 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1238,7 +1244,7 @@ int t() {
 setupterm()
 ; return 0; }
 EOF
-if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_setupterm=$ac_lib; else ac_cv_funclib_setupterm=yes; fi";break
 fi
@@ -1308,7 +1314,7 @@ if eval "test \"\$ac_cv_func_socket\" != yes" ; then
 			LIBS="$ac_lib $ac_save_LIBS"
 		fi
 		cat > conftest.$ac_ext <<EOF
-#line 1312 "configure"
+#line 1318 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1316,7 +1322,7 @@ int t() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:1320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
 fi
@@ -1386,7 +1392,7 @@ if eval "test \"\$ac_cv_func_gethostbyname\" != yes" ; then
 			LIBS="$ac_lib $ac_save_LIBS"
 		fi
 		cat > conftest.$ac_ext <<EOF
-#line 1390 "configure"
+#line 1396 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1394,7 +1400,7 @@ int t() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
 fi
@@ -1458,7 +1464,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1462 "configure"
+#line 1468 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1480,7 +1486,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1507,7 +1513,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1511 "configure"
+#line 1517 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1529,7 +1535,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1558,7 +1564,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1562 "configure"
+#line 1568 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1580,7 +1586,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1609,7 +1615,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1613 "configure"
+#line 1619 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1631,7 +1637,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1669,7 +1675,7 @@ if eval "test \"\$ac_cv_func_logout\" != yes" ; then
 			LIBS="$ac_lib $ac_save_LIBS"
 		fi
 		cat > conftest.$ac_ext <<EOF
-#line 1673 "configure"
+#line 1679 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1677,7 +1683,7 @@ int t() {
 logout()
 ; return 0; }
 EOF
-if { (eval echo configure:1681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_logout=$ac_lib; else ac_cv_funclib_logout=yes; fi";break
 fi
@@ -1743,12 +1749,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1747 "configure"
+#line 1753 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1780,12 +1786,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1784 "configure"
+#line 1790 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1817,12 +1823,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1821 "configure"
+#line 1827 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2002,6 +2008,7 @@ s%@mandir@%$mandir%g
 s%@CC@%$CC%g
 s%@RANLIB@%$RANLIB%g
 s%@CPP@%$CPP%g
+s%@LD_FLAGS@%$LD_FLAGS%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@AUTHENTICATION@%$AUTHENTICATION%g
diff --git a/appl/telnet/configure.in b/appl/telnet/configure.in
index e5e0c89cd..33403d8d9 100644
--- a/appl/telnet/configure.in
+++ b/appl/telnet/configure.in
@@ -23,8 +23,12 @@ AC_PROG_CPP
 # If we're using gcc and the user hasn't specified CFLAGS, add -O to CFLAGS.
 test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O"
 
-AC_SUBST(CFLAGS)dnl
-AC_SUBST(LDFLAGS)dnl
+AC_CACHE_VAL(krb_cv_ld_flags,
+krb_cv_ld_flags="") dnl
+LD_FLAGS=${krb_cv_ld_flags}
+AC_SUBST(CFLAGS) dnl
+AC_SUBST(LDFLAGS) dnl
+AC_SUBST(LD_FLAGS) dnl
 
 AC_PROG_INSTALL
 
diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in
index c4860ad50..a54649a28 100644
--- a/appl/telnet/telnet/Makefile.in
+++ b/appl/telnet/telnet/Makefile.in
@@ -11,6 +11,7 @@ AR = ar
 RANLIB = @RANLIB@
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
+LD_FLAGS = @LD_FLAGS@
 LIBS = @LIBS@
 INSTALL = @INSTALL@
 MKDIRHIER = @top_srcdir@/../../mkdirhier-sh
@@ -35,7 +36,7 @@ LIBKRB		= @LIBKRB@
 LIBDES		= @LIBDES@
 LIBCOM_ERR	= @LIBCOM_ERR@
 
-KLIB=$(KRBLIBPATH) $(LIBKRB) $(LIBDES) $(LIBCOM_ERR) 
+KLIB=$(KRBLIBPATH) $(LIBKRB) $(LIBDES)
 
 
 all: telnet
@@ -45,7 +46,7 @@ all: telnet
 	@KRBINCPATH@ -I.. -I$(srcdir)/.. $<
 
 telnet: $(OBJECTS)
-	$(CC) -o telnet $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o telnet $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
 
 install: all
 	$(MKDIRHIER) $(prefix)/bin
diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in
index a8fec5e96..f85cde3d9 100644
--- a/appl/telnet/telnetd/Makefile.in
+++ b/appl/telnet/telnetd/Makefile.in
@@ -11,6 +11,7 @@ AR = ar
 RANLIB = @RANLIB@
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
+LD_FLAGS = @LD_FLAGS@
 LIBS = @LIBS@
 INSTALL = @INSTALL@
 MKDIRHIER = @top_srcdir@/../../mkdirhier-sh
@@ -38,7 +39,7 @@ LIBDES		= @LIBDES@
 LIBKAFS		= @LIBKAFS@
 LIBCOM_ERR	= @LIBCOM_ERR@
 
-KLIB=$(KRBLIBPATH) $(LIBKAFS) $(LIBKRB) $(LIBDES) $(LIBCOM_ERR) 
+KLIB=$(KRBLIBPATH) $(LIBKAFS) $(LIBKRB) $(LIBDES)
 
 
 all: telnetd
@@ -50,7 +51,7 @@ $(OBJECTS): ../config.h
 	@KRBINCPATH@ -I.. -I$(srcdir)/.. -I. -I$(srcdir) $<
 
 telnetd: $(OBJECTS)
-	$(CC) -o telnetd $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o telnetd $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
 
 install: all
 	$(MKDIRHIER) $(prefix)/libexec
diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in
index 8ee04de7b..b943d4cff 100644
--- a/appl/xnlock/Makefile.in
+++ b/appl/xnlock/Makefile.in
@@ -10,6 +10,7 @@ CC = @CC@
 RANLIB = @RANLIB@
 DEFS = @DEFS@
 CFLAGS = $(XINCS) @CFLAGS@
+LD_FLAGS = @LD_FLAGS@
 LIBS = $(XLIBS) @LIBS@
 INSTALL = @INSTALL@
 
@@ -69,6 +70,6 @@ dist: $(DISTFILES)
 
 
 xnlock: xnlock.o
-	$(CC) $(LDFLAGS) -o $@ xnlock.o -L../../lib/kafs -lkafs -L../../lib/krb -lkrb -L../../lib/des -ldes  $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o -L../../lib/kafs -lkafs -L../../lib/krb -lkrb -L../../lib/des -ldes  $(LIBS)
 
 $(OBJECTS): ../../config.h
diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
index 05e8885d4..6518def63 100644
--- a/lib/kafs/Makefile.in
+++ b/lib/kafs/Makefile.in
@@ -44,7 +44,7 @@ Wall:
 
 install: all
 	$(MKDIRHIER) $(libdir)
-	$(INSTALL_DATA) $(LIB) $(libdir)
+	$(INSTALL) -m 0555 $(LIB) $(libdir)
 
 uninstall: