diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 18ea1201ac62..5c45666fa90d 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -105,7 +105,7 @@ SUBDIR=	ac \
 	${_ndp} \
 	newsyslog \
 	nfsd \
-	${_ngctl} \
+	ngctl \
 	nghook \
 	nologin \
 	ntp \
@@ -263,11 +263,6 @@ _ypset=		ypset
 _authpf=	authpf
 .endif
 
-.if ${MK_LIBTHR} != "no" || \
-    (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")
-_ngctl=		ngctl
-.endif
-
 .if ${MK_LPR} != "no"
 _lpr=		lpr
 .endif
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index 2d243417b0fe..bd936997e8af 100644
--- a/usr.sbin/ngctl/Makefile
+++ b/usr.sbin/ngctl/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 # $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $
 
+.include <bsd.own.mk>
+
 PROG=	ngctl
 MAN=	ngctl.8
 SRCS=	main.c mkpeer.c config.c connect.c dot.c name.c show.c list.c \
@@ -11,6 +13,11 @@ WARNS?=	3
 NGCTL_NO_LIBEDIT=
 .endif
 
+.if ${MK_LIBTHR} == "no" && \
+    (${MACHINE_ARCH} == "sparc64" || ${MK_LIBPTHREAD} == "no")
+NGCTL_NO_LIBEDIT=
+.endif
+
 DPADD=	${LIBNETGRAPH}
 LDADD=	-lnetgraph