diff --git a/lib/Makefile b/lib/Makefile
index 7a5172aa0114..ca8ad9abd44c 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -27,7 +27,7 @@ SUBDIR=	${_csu} libcom_err libcrypt libkvm msun libmd \
 	libedit libfetch libform libftpio ${_libgnumalloc} ${_libio} libipsec \
 	libipx libisc libmenu ${_libmp} ${_libncp} \
 	libnetgraph libopie libpam libpanel libpcap \
-	${_libresolv} libsmdb libsmutil \
+	${_libresolv} ${_libsmdb} ${_libsmutil} \
 	libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT})
@@ -51,6 +51,11 @@ _libc_r=	libc_r
 _libbind=	libbind
 .endif
 
+.if !defined(NO_SENDMAIL)
+_libsmdb=	libsmdb
+_libsmutil=	libsmutil
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 _compat=	compat
 _libncp=	libncp
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index 58e708a3ce9f..7f6334d9a6f6 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -12,7 +12,11 @@
 # 07.lpd
 
 SUBDIR=	title contents 01.setup 02.config 03.fsck 04.quotas 05.fastfs \
-	06.nfs 08.sendmailop 10.named 11.timedop \
+	06.nfs 10.named 11.timedop \
 	12.timed 18.net
 
+.if !defined(NO_SENDMAIL)
+SUBDIR+=08.sendmailop 
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 34d9ab1e3155..7ff1f86ad979 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -168,7 +168,6 @@ SUBDIR=	apply \
 	users \
 	uudecode \
 	uuencode \
-	vacation \
 	vgrind \
 	vi \
 	vis \
@@ -207,6 +206,10 @@ SUBDIR+=dig \
 	host
 .endif
 
+.if !defined(NO_SENDMAIL)
+SUBDIR+=vacation 
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 # Things that don't compile on alpha or are aout specific:
 SUBDIR+=ar \