diff --git a/Makefile.inc1 b/Makefile.inc1
index 010f5ac2bb5..b66743e154e 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2627,8 +2627,6 @@ _kerberos5_bootstrap_tools= \
 	krb5/util/compile_et \
 	krb5/util/support \
 	krb5/util/et \
-	lib/ncurses/tinfo \
-	lib/libedit \
 	krb5/util/ss \
 	krb5/util/profile \
 	krb5/util/verto
diff --git a/crypto/krb5/src/util/ss/listen.c b/crypto/krb5/src/util/ss/listen.c
index 08427df1e5c..fe18475447b 100644
--- a/crypto/krb5/src/util/ss/listen.c
+++ b/crypto/krb5/src/util/ss/listen.c
@@ -14,9 +14,6 @@
 #include <termios.h>
 #include <sys/param.h>
 
-#ifdef __FreeBSD__
-#include <edit/readline/readline.h>
-#else
 #if defined(HAVE_LIBEDIT)
 #include <editline/readline.h>
 #elif defined(HAVE_READLINE)
@@ -25,7 +22,6 @@
 #else
 #define NO_READLINE
 #endif
-#endif
 
 static ss_data *current_info;
 static jmp_buf listen_jmpb;
diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h
index a5e2ea5838b..fe281d13695 100644
--- a/krb5/include/autoconf.h
+++ b/krb5/include/autoconf.h
@@ -260,7 +260,7 @@
 #define HAVE_LIBCRYPTO 1
 
 /* Define if building with libedit. */
-#define HAVE_LIBEDIT 1
+/* #undef HAVE_LIBEDIT */
 
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 /* #undef HAVE_LIBNSL */
diff --git a/krb5/usr.bin/kadmin/Makefile b/krb5/usr.bin/kadmin/Makefile
index b2a094795d4..182cabb8f9f 100644
--- a/krb5/usr.bin/kadmin/Makefile
+++ b/krb5/usr.bin/kadmin/Makefile
@@ -9,8 +9,8 @@
 
 PROG=	kadmin
 
-LIBADD=	kadmin_common edit kadm5clnt_mit gssrpc gssapi_krb5 krb5 k5crypto \
-	com_err krb5ss krb5profile krb5support tinfow sys
+LIBADD=	kadmin_common kadm5clnt_mit gssrpc gssapi_krb5 krb5 k5crypto \
+	com_err krb5ss krb5profile krb5support sys
 
 SRCS=	keytab.c
 
diff --git a/krb5/usr.bin/ktutil/Makefile b/krb5/usr.bin/ktutil/Makefile
index 6bcb4877ed6..15991cb49bc 100644
--- a/krb5/usr.bin/ktutil/Makefile
+++ b/krb5/usr.bin/ktutil/Makefile
@@ -9,7 +9,7 @@
 
 PROG=	ktutil
 
-LIBADD=	edit krb5 k5crypto com_err krb5profile krb5support krb5ss tinfow sys
+LIBADD=	krb5 k5crypto com_err krb5profile krb5support krb5ss sys
 
 SRCS=	ktutil.c \
 	ktutil_ct.c \
diff --git a/krb5/usr.sbin/kadmin.local/Makefile b/krb5/usr.sbin/kadmin.local/Makefile
index 4b99f490bd7..3930c0fc469 100644
--- a/krb5/usr.sbin/kadmin.local/Makefile
+++ b/krb5/usr.sbin/kadmin.local/Makefile
@@ -11,8 +11,8 @@ PACKAGE=	kerberos-kdc
 
 PROG=	kadmin.local
 
-LIBADD=	kadmin_common edit kadm5srv_mit kdb5 gssrpc gssapi_krb5 krb5 \
-	k5crypto com_err krb5profile krb5support krb5ss tinfow sys
+LIBADD=	kadmin_common kadm5srv_mit kdb5 gssrpc gssapi_krb5 krb5 \
+	k5crypto com_err krb5profile krb5support krb5ss sys
 
 SRCS=	keytab_local.c
 
diff --git a/krb5/util/ss/Makefile b/krb5/util/ss/Makefile
index e7e02518428..2c43f2b5934 100644
--- a/krb5/util/ss/Makefile
+++ b/krb5/util/ss/Makefile
@@ -47,6 +47,11 @@ CFLAGS+=-I${KRB5_DIR}/util/ss \
 	-I${.OBJDIR:H} \
 	-I${.OBJDIR}
 
+.if !defined(BOOTSTRAPPING)
+CFLAGS+= -DHAVE_READLINE=1 \
+	 -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit
+.endif
+
 GEN=	std_rqs.c ${GEN_SS_ERR_C} ${GEN_SS_ERR_H}
 GEN_SCRIPTS=	ct_c.awk ct_c.sed mk_cmds
 GEN_SS_ERR_C=	${GEN_SS_ERR:S/.et$/.c/}
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index f21d519160d..88202aeb78f 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -487,6 +487,7 @@ _DP_be=		zfs spl nvpair zfsbootenv
 _DP_netmap=
 _DP_ifconfig=	m
 _DP_pfctl=	nv
+_DP_krb5ss=		edit
 
 # OFED support
 .if ${MK_OFED} != "no"