diff --git a/eBones/libexec/telnetd/Makefile b/eBones/libexec/telnetd/Makefile
index 722bde9f57d..17ffa3e0a2d 100644
--- a/eBones/libexec/telnetd/Makefile
+++ b/eBones/libexec/telnetd/Makefile
@@ -4,16 +4,20 @@
 # current eBones/des lib don't have it
 # Kerberos4 stuff ifdefed by MAKE_KERBEROS (make.conf) because of it
 
+# Do not define -DKLUDGELINEMODE, as it does not interact well with many
+# telnet implementations.
+
 PROG=	telnetd
-CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS
-CFLAGS+=-DOLD_ENVIRON -DENV_HACK
-CFLAGS+=-I${.CURDIR}/../../lib
+MAN8=	telnetd.8
+
 SRCS=	authenc.c global.c slc.c state.c sys_term.c telnetd.c \
 	termstat.c utility.c
+
 DPADD=	${LIBUTIL} ${LIBTERMCAP}
 LDADD=	-lutil -ltermcap -ltelnet
 
-MAN8=	telnetd.8
+CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK
+CFLAGS+=-I${.CURDIR}/../../lib
 
 #ifdef	ENCRYPTION
 
diff --git a/eBones/libexec/telnetd/ext.h b/eBones/libexec/telnetd/ext.h
index 38842894e06..db3f1c39531 100644
--- a/eBones/libexec/telnetd/ext.h
+++ b/eBones/libexec/telnetd/ext.h
@@ -45,9 +45,7 @@ extern int	uselinemode;	/* what linemode to use (on/off) */
 extern int	editmode;	/* edit modes in use */
 extern int	useeditmode;	/* edit modes to use */
 extern int	alwayslinemode;	/* command line option */
-# ifdef	KLUDGELINEMODE
 extern int	lmodetype;	/* Client support for linemode */
-# endif	/* KLUDGELINEMODE */
 #endif	/* LINEMODE */
 extern int	flowmode;	/* current flow control state */
 extern int	restartany;	/* restart output on any character state */
diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
index 722bde9f57d..17ffa3e0a2d 100644
--- a/secure/libexec/telnetd/Makefile
+++ b/secure/libexec/telnetd/Makefile
@@ -4,16 +4,20 @@
 # current eBones/des lib don't have it
 # Kerberos4 stuff ifdefed by MAKE_KERBEROS (make.conf) because of it
 
+# Do not define -DKLUDGELINEMODE, as it does not interact well with many
+# telnet implementations.
+
 PROG=	telnetd
-CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS
-CFLAGS+=-DOLD_ENVIRON -DENV_HACK
-CFLAGS+=-I${.CURDIR}/../../lib
+MAN8=	telnetd.8
+
 SRCS=	authenc.c global.c slc.c state.c sys_term.c telnetd.c \
 	termstat.c utility.c
+
 DPADD=	${LIBUTIL} ${LIBTERMCAP}
 LDADD=	-lutil -ltermcap -ltelnet
 
-MAN8=	telnetd.8
+CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK
+CFLAGS+=-I${.CURDIR}/../../lib
 
 #ifdef	ENCRYPTION
 
diff --git a/secure/libexec/telnetd/ext.h b/secure/libexec/telnetd/ext.h
index 38842894e06..db3f1c39531 100644
--- a/secure/libexec/telnetd/ext.h
+++ b/secure/libexec/telnetd/ext.h
@@ -45,9 +45,7 @@ extern int	uselinemode;	/* what linemode to use (on/off) */
 extern int	editmode;	/* edit modes in use */
 extern int	useeditmode;	/* edit modes to use */
 extern int	alwayslinemode;	/* command line option */
-# ifdef	KLUDGELINEMODE
 extern int	lmodetype;	/* Client support for linemode */
-# endif	/* KLUDGELINEMODE */
 #endif	/* LINEMODE */
 extern int	flowmode;	/* current flow control state */
 extern int	restartany;	/* restart output on any character state */