diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index edf5cf18a967..670931255c00 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -20,7 +20,6 @@ FILES=	DAEMON \
 	${_bsnmpd} \
 	${_bthidd} \
 	${_casperd} \
-	ccd \
 	cleanvar \
 	cleartmp \
 	cron \
@@ -167,6 +166,10 @@ _bsnmpd=	bsnmpd
 _casperd=	casperd
 .endif
 
+.if ${MK_CCD} != "no"
+FILES+=		ccd
+.endif
+
 .if ${MK_FTP} != "no"
 FILES+=		ftpd
 .endif
@@ -226,10 +229,6 @@ FILES+=		lpd
 FILES+=		ugidfw
 .endif
 
-.if ${MK_NS_CACHING} != "no"
-_nscd=		nscd
-.endif
-
 .if ${MK_KERBEROS} != "no"
 FILES+=		ipropd_master
 FILES+=		ipropd_slave
@@ -260,6 +259,10 @@ FILES+=		ypupdated
 FILES+=		ypxfrd
 .endif
 
+.if ${MK_NS_CACHING} != "no"
+_nscd=		nscd
+.endif
+
 .if ${MK_NTP} != "no"
 FILES+=		ntpd
 FILES+=		ntpdate
diff --git a/sbin/Makefile b/sbin/Makefile
index 658f876f450f..306768115123 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -8,7 +8,6 @@
 SUBDIR=adjkerntz \
 	badsect \
 	camcontrol \
-	ccdconfig \
 	clri \
 	comcontrol \
 	conscontrol \
@@ -78,6 +77,10 @@ SUBDIR+=	atm
 SUBDIR+=	casperd
 .endif
 
+.if ${MK_CCD} != "no"
+SUBDIR+=	ccdconfig
+.endif
+
 .if ${MK_CXX} != "no"
 SUBDIR+=	devd
 .endif
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 0fcdda2e93a7..5fd160852eba 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -91,7 +91,7 @@ MAN=	aac.4 \
 	cc_htcp.4 \
 	cc_newreno.4 \
 	cc_vegas.4 \
-	ccd.4 \
+	${_ccd.4} \
 	cd.4 \
 	cdce.4 \
 	ch.4 \
@@ -743,6 +743,10 @@ SUBDIR=	man4.${MACHINE_CPUARCH}
 _bhyve.4=	bhyve.4
 .endif
 
+.if ${MK_CCD} != "no"
+_ccd.4=		ccd.4
+.endif
+
 .if ${MK_ISCSI} != "no"
 MAN+=		iscsi.4
 MAN+=		iscsi_initiator.4
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index a0ad6a1a05bf..4e1de51df5dc 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -67,6 +67,7 @@ __DEFAULT_YES_OPTIONS = \
     CALENDAR \
     CAPSICUM \
     CASPER \
+    CCD \
     CDDL \
     CPP \
     CROSS_COMPILER \
diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index 43a0d822084e..eeb79f74c152 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -25,6 +25,7 @@
 __DEFAULT_YES_OPTIONS = \
     AUTOFS \
     BLUETOOTH \
+    CCD \
     CDDL \
     CRYPT \
     FORMAT_EXTENSIONS \
diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile
index a94f7600505a..f54a3e83c8a1 100644
--- a/sys/modules/geom/Makefile
+++ b/sys/modules/geom/Makefile
@@ -1,8 +1,10 @@
 # $FreeBSD$
 
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
+
 SUBDIR=	geom_bde \
 	geom_cache \
-	geom_ccd \
 	geom_concat \
 	geom_eli \
 	geom_gate \
@@ -25,4 +27,8 @@ SUBDIR=	geom_bde \
 	geom_virstor \
 	geom_zero
 
+.if ${MK_CCD} != "no" || defined(ALL_MODULES)
+SUBDIR+=	geom_ccd
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index e198075f41e8..23854eeb17db 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -934,6 +934,13 @@ OLD_FILES+=sbin/casper
 OLD_FILES+=usr/lib/libcasper.a
 .endif
 
+.if ${MK_CCD} == no
+OLD_FILES+=etc/rc.d/ccd
+OLD_FILES+=sbin/ccdconfig
+OLD_FILES+=usr/share/man/man4/ccd.4.gz
+OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz
+.endif
+
 .if ${MK_CDDL} == no
 OLD_LIBS+=lib/libavl.so.2
 OLD_LIBS+=lib/libctf.so.2