diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index 755fbee77c84..274ec39e2e2d 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -11,7 +11,7 @@ NTPDEFS=   -DSYS_FREEBSD
 CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS}
 
 .if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
-CFLAGS+= -DOPENSSL
+CFLAGS+= -DOPENSSL -DUSE_OPENSSL_CRYPTO_RAND -DAUTOKEY
 .endif
 
 WARNS?=	0
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h
index 8bcf6e65387f..a5b5b4340cba 100644
--- a/usr.sbin/ntp/config.h
+++ b/usr.sbin/ntp/config.h
@@ -9,7 +9,7 @@
 /* #undef ADJTIME_IS_ACCURATE */
 
 /* Support NTP Autokey protocol? */
-#define AUTOKEY 1
+/* #define AUTOKEY 1 */
 
 /* why not HAVE_P_S? */
 /* #undef CALL_PTHREAD_SETCONCURRENCY */
@@ -1578,7 +1578,7 @@ typedef unsigned int	uintptr_t;
 #define USE_FSETOWNCTTY 1
 
 /* Use OpenSSL's crypto random functions */
-#define USE_OPENSSL_CRYPTO_RAND 1
+/* #define USE_OPENSSL_CRYPTO_RAND 1 */
 
 /* OK to use snprintb()? */
 /* #undef USE_SNPRINTB */
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index 3c29f9b2a8c5..d3f10f3922bf 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile
+++ b/usr.sbin/ntp/ntp-keygen/Makefile
@@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
 LIBADD+=	ntp opts pthread
 
 .if ${MK_OPENSSL} != "no"
-LIBADD+=	md crypto
+LIBADD+=	crypto
 .endif
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index 8da2c68197cf..9f80b15eaff3 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -35,10 +35,12 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/ntpd \
 	-I${.CURDIR}/../ \
 	-I${.CURDIR}
 
-LIBADD=	parse ntp m rt opts md pthread
+LIBADD=	parse ntp m opts pthread
 
 .if ${MK_OPENSSL} != "no"
 LIBADD+=	crypto
+.else
+LIBADD+=	md
 .endif
 
 CLEANFILES+= .version version.c
diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile
index 8fdd8f75e056..10352e80db69 100644
--- a/usr.sbin/ntp/ntpdate/Makefile
+++ b/usr.sbin/ntp/ntpdate/Makefile
@@ -14,10 +14,12 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
 	-I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
 	-I${.CURDIR}/../
 
-LIBADD=	rt ntp m pthread
+LIBADD=	ntp m pthread
 
 .if ${MK_OPENSSL} != "no"
-LIBADD+=	md ssl crypto
+LIBADD+=	crypto
+.else
+LIBADD+=	md
 .endif
 
 CLEANFILES+= .version version.c
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index 2129c202fb6d..f19211aed7ab 100644
--- a/usr.sbin/ntp/ntpdc/Makefile
+++ b/usr.sbin/ntp/ntpdc/Makefile
@@ -18,12 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
 	-I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
 	-I${.CURDIR}/../ -I${.CURDIR}
 
-LIBADD=	edit md ntp m readline opts ncurses pthread
+LIBADD=	edit ntp m opts pthread
 CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
 		-I${DESTDIR}/${INCLUDEDIR}/edit
 
 .if ${MK_OPENSSL} != "no"
-LIBADD+=	ssl crypto
+LIBADD+=	crypto
+.else
+LIBADD+=	md
 .endif
 
 CLEANFILES+= .version version.c
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index d512cffeacac..f9901a029b4d 100644
--- a/usr.sbin/ntp/ntpq/Makefile
+++ b/usr.sbin/ntp/ntpq/Makefile
@@ -21,10 +21,12 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
 	-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
 	-I${.CURDIR}/../
 
-LIBADD+=	edit md ntp opts m pthread
+LIBADD+=	edit ntp opts m pthread
 
 .if ${MK_OPENSSL} != "no"
-LIBADD+=	ssl crypto
+LIBADD+=	crypto
+.else
+LIBADD+=	md
 .endif
 
 CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
diff --git a/usr.sbin/ntp/sntp/Makefile b/usr.sbin/ntp/sntp/Makefile
index eba7b83b84cb..ce5c01ddb469 100644
--- a/usr.sbin/ntp/sntp/Makefile
+++ b/usr.sbin/ntp/sntp/Makefile
@@ -23,7 +23,9 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
 LIBADD=	m opts ntp ntpevent pthread
 
 .if ${MK_OPENSSL} != "no"
-LIBADD+=	md ssl crypto
+LIBADD+=	crypto
+.else
+LIBADD+=	md
 .endif
 
 .include <bsd.prog.mk>