diff --git a/etc/Makefile b/etc/Makefile
index f18ace663994..979958005668 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -80,10 +80,6 @@ BIN1+=	hosts.lpd printcap
 BIN1+=	${SRCTOP}/usr.bin/mail/misc/mail.rc
 .endif
 
-.if ${MK_NTP} != "no"
-BIN1+=	ntp.conf
-.endif
-
 .if ${MK_OPENSSH} != "no"
 SSH=	${SRCTOP}/crypto/openssh/ssh_config \
 	${SRCTOP}/crypto/openssh/sshd_config \
@@ -175,9 +171,6 @@ distribution:
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
 	${_+_}cd ${.CURDIR}/newsyslog.conf.d; ${MAKE} install
-.if ${MK_NTP} != "no"
-	${_+_}cd ${.CURDIR}/ntp; ${MAKE} install
-.endif
 	${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
 	${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
 	${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
diff --git a/etc/ntp/Makefile b/etc/ntp/Makefile
deleted file mode 100644
index f1aff4f9006b..000000000000
--- a/etc/ntp/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-NO_OBJ=
-
-FILES=	leap-seconds
-
-FILESDIR=	/etc/ntp
-FILESMODE=	644
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index b04e4b534699..89b8677f64e9 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -7,6 +7,10 @@ MAN=
 .PATH:	${SRCTOP}/contrib/ntp/ntpd \
 	${.OBJDIR}
 
+CONFS=	ntp.conf
+FILES=	leap-seconds
+FILESDIR=	/etc/ntp
+FILESMODE=	644
 PROG=	ntpd
 
 SRCS=	cmd_args.c ntp_config.c ntp_control.c ntp_crypto.c ntp_filegen.c \
diff --git a/etc/ntp/leap-seconds b/usr.sbin/ntp/ntpd/leap-seconds
similarity index 100%
rename from etc/ntp/leap-seconds
rename to usr.sbin/ntp/ntpd/leap-seconds
diff --git a/etc/ntp.conf b/usr.sbin/ntp/ntpd/ntp.conf
similarity index 100%
rename from etc/ntp.conf
rename to usr.sbin/ntp/ntpd/ntp.conf