Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile
+++ head/etc/Makefile
@@ -192,12 +192,17 @@
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		${BIN1} ${DESTDIR}/etc; \
 	    cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
-	    services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
-		${DESTDIR}/etc/services; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
 		${BIN2} ${DESTDIR}/etc; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
+
+.if ${MK_SERVICESDB} != "no"
+	cd ${.CURDIR}; \
+	    services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
+		${DESTDIR}/etc/services;
+.endif
+
 .if ${MK_BSNMP} != "no"
 	cd ${.CURDIR}; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
Index: head/share/mk/src.opts.mk
===================================================================
--- head/share/mk/src.opts.mk
+++ head/share/mk/src.opts.mk
@@ -160,6 +160,7 @@
     RESCUE \
     ROUTED \
     SENDMAIL \
+    SERVICESDB \
     SETUID_LOGIN \
     SHAREDOCS \
     SOURCELESS \
Index: head/tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc
+++ head/tools/build/mk/OptionalObsoleteFiles.inc
@@ -7527,6 +7527,10 @@
 OLD_DIRS+=usr/share/sendmail
 .endif
 
+.if ${MK_SERVICESDB} == no
+OLD_FILES+=var/db/services.db
+.endif
+
 .if ${MK_SHAREDOCS} == no
 OLD_FILES+=usr/share/doc/pjdfstest/README
 OLD_DIRS+=usr/share/doc/pjdfstest
Index: head/tools/build/options/WITHOUT_SERVICESDB
===================================================================
--- head/tools/build/options/WITHOUT_SERVICESDB
+++ head/tools/build/options/WITHOUT_SERVICESDB
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not install
+.Pa /var/db/services.db .