diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc
index 4347591cf563..bd13613e1d93 100644
--- a/usr.sbin/Makefile.inc
+++ b/usr.sbin/Makefile.inc
@@ -2,3 +2,5 @@
 # $FreeBSD$
 
 BINDIR?=	/usr/sbin
+
+WARNS?=		6
diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile
index c45a0d69ff42..46064fcf300b 100644
--- a/usr.sbin/ac/Makefile
+++ b/usr.sbin/ac/Makefile
@@ -3,8 +3,6 @@
 PROG=	ac
 MAN=	ac.8
 
-WARNS?=	4
-
 # Temporary, while tracking down problem wrt 64-bit time_t's on sparc64
 .if ${MACHINE_ARCH} == "sparc64"
 CFLAGS+=-DDEBUG
diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile
index 7ea45a7df929..ea9b4f43565a 100644
--- a/usr.sbin/accton/Makefile
+++ b/usr.sbin/accton/Makefile
@@ -4,6 +4,4 @@
 PROG=	accton
 MAN=	accton.8
 
-WARNS?=	4
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpiconf/Makefile b/usr.sbin/acpi/acpiconf/Makefile
index bb0df4b406e5..5f862a2c621e 100644
--- a/usr.sbin/acpi/acpiconf/Makefile
+++ b/usr.sbin/acpi/acpiconf/Makefile
@@ -3,6 +3,5 @@
 
 PROG=	acpiconf
 MAN=	acpiconf.8
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile
index 21a4140defcc..e00450091222 100644
--- a/usr.sbin/acpi/acpidump/Makefile
+++ b/usr.sbin/acpi/acpidump/Makefile
@@ -3,6 +3,5 @@
 PROG=	acpidump
 MAN=	acpidump.8
 SRCS=	acpi.c acpi_user.c acpidump.c
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index ff6ebd7fbee8..130c39e951ae 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -50,6 +50,8 @@ SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdelete.c	\
 	utglobal.c utinit.c utlock.c utmath.c utmisc.c		\
 	utmutex.c utobject.c utresrc.c utstate.c utxface.c
 
+WARNS?=	2
+
 MAN=	iasl.8
 
 CFLAGS+= -DACPI_ASL_COMPILER -I.
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index c8451f6b1fc5..673edc1b9152 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -40,6 +40,8 @@ RPCCOM=		rpcgen
 MOUNT_X=	${DESTDIR}/usr/include/rpcsvc/mount.x
 NFS_PROT_X=	${DESTDIR}/usr/include/rpcsvc/nfs_prot.x
 
+WARNS?=	1
+
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
 .endif
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index f6939e2b3933..08ed25fce66a 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -4,6 +4,5 @@ PROG=	apm
 MAN=	apm.8
 MLINKS=	apm.8 apmconf.8
 MANSUBDIR= /${MACHINE_ARCH}
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index 7e81b35dbc77..5ccf7e63e5ee 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -5,6 +5,8 @@ MAN=	apmd.8
 MANSUBDIR= /i386
 SRCS=	apmd.c apmdlex.l apmdparse.y y.tab.h
 
+WARNS?=	0
+
 DPADD=	${LIBL}
 LDADD=	-ll
 
diff --git a/usr.sbin/asf/Makefile b/usr.sbin/asf/Makefile
index b4b7af350138..0db69e82cc6d 100644
--- a/usr.sbin/asf/Makefile
+++ b/usr.sbin/asf/Makefile
@@ -7,6 +7,4 @@ MAN=	asf.8
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 
-WARNS?=	4
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/audit/Makefile b/usr.sbin/audit/Makefile
index 9f31741500ac..a3f7fbf241fd 100644
--- a/usr.sbin/audit/Makefile
+++ b/usr.sbin/audit/Makefile
@@ -13,4 +13,6 @@ MAN=	audit.8
 DPADD=	${LIBBSM}
 LDADD=	-lbsm
 
+WARNS?=	5
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/auditd/Makefile b/usr.sbin/auditd/Makefile
index 839458d98b4f..201f961986b9 100644
--- a/usr.sbin/auditd/Makefile
+++ b/usr.sbin/auditd/Makefile
@@ -14,4 +14,6 @@ MAN=	auditd.8
 DPADD=	${LIBBSM} ${LIBAUDITD}
 LDADD=	-lbsm -lauditd
 
+WARNS?=	3
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/auditreduce/Makefile b/usr.sbin/auditreduce/Makefile
index 73b355de4e12..7dc955337da1 100644
--- a/usr.sbin/auditreduce/Makefile
+++ b/usr.sbin/auditreduce/Makefile
@@ -13,4 +13,6 @@ MAN=	auditreduce.1
 DPADD=	${LIBBSM}
 LDADD=	-lbsm
 
+WARNS?=	3
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/authpf/Makefile b/usr.sbin/authpf/Makefile
index b4c9b4f36217..0a24b8efc087 100644
--- a/usr.sbin/authpf/Makefile
+++ b/usr.sbin/authpf/Makefile
@@ -19,4 +19,6 @@ CFLAGS+= -DENABLE_ALTQ
 LDADD+= -lm -lmd -lutil
 DPADD+= ${LIBM} ${LIBMD} ${LIBUTIL}
 
+WARNS?=	3
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile
index dc02cad7b41d..79e7cd299021 100644
--- a/usr.sbin/boot0cfg/Makefile
+++ b/usr.sbin/boot0cfg/Makefile
@@ -3,8 +3,6 @@
 PROG=	boot0cfg
 MAN=	boot0cfg.8
 
-WARNS?=	2
-
 DPADD=	${LIBGEOM}
 LDADD=	-lgeom
 
diff --git a/usr.sbin/bootparamd/Makefile.inc b/usr.sbin/bootparamd/Makefile.inc
index 1e4d46f113a5..5c01215dd550 100644
--- a/usr.sbin/bootparamd/Makefile.inc
+++ b/usr.sbin/bootparamd/Makefile.inc
@@ -2,3 +2,5 @@
 # $FreeBSD$
 
 BINDIR?=	/usr/sbin
+
+WARNS?=		2
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile
index 9fbf3667920f..e74f675b4abc 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile
@@ -14,7 +14,6 @@ XSYM=	snmpMIB begemotSnmpdModuleTable begemotSnmpd begemotTrapSinkTable \
 	freeBSDVersion
 CLEANFILES= oid.h tree.c tree.h
 MAN=	bsnmpd.1 snmpmod.3
-WARNS?=	6
 NO_WERROR=
 
 FILESGROUPS= BMIBS DEFS
diff --git a/usr.sbin/bsnmpd/gensnmptree/Makefile b/usr.sbin/bsnmpd/gensnmptree/Makefile
index 11c6a3b28f18..a92f4eb3684e 100644
--- a/usr.sbin/bsnmpd/gensnmptree/Makefile
+++ b/usr.sbin/bsnmpd/gensnmptree/Makefile
@@ -10,4 +10,6 @@ CFLAGS+= -I${CONTRIB}/lib
 CFLAGS+= -DQUADFMT='"llu"' -DQUADXFMT='"llx"' -DHAVE_STDINT_H
 CFLAGS+= -DHAVE_INTTYPES_H
 
+WARNS?=	5
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
index 74724644cf49..92b0a4ba9125 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
@@ -4,7 +4,6 @@
 
 MOD=	pf
 SRCS=	pf_snmp.c
-WARNS?=	6
 
 XSYM=	begemotPf
 DEFS=	${MOD}_tree.def
diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
index 6ca452eec1c2..32cf99d5edac 100644
--- a/usr.sbin/btxld/Makefile
+++ b/usr.sbin/btxld/Makefile
@@ -4,6 +4,4 @@ PROG=	btxld
 MAN=	btxld.8
 SRCS=	btxld.c elfh.c
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/burncd/Makefile b/usr.sbin/burncd/Makefile
index bd4f285760ca..11e07c79d0c7 100644
--- a/usr.sbin/burncd/Makefile
+++ b/usr.sbin/burncd/Makefile
@@ -3,6 +3,4 @@
 PROG=	burncd
 MAN=	burncd.8
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile
index 40addadc52ef..fc78e005320a 100644
--- a/usr.sbin/cdcontrol/Makefile
+++ b/usr.sbin/cdcontrol/Makefile
@@ -2,7 +2,7 @@
 
 PROG= cdcontrol
 
-WARNS?= 2
+WARNS?= 3
 
 DPADD=	${LIBEDIT} ${LIBTERMCAP}
 LDADD=	-ledit -ltermcap
diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile
index 1c52f4680f83..a7bfc548ced1 100644
--- a/usr.sbin/chkgrp/Makefile
+++ b/usr.sbin/chkgrp/Makefile
@@ -3,6 +3,4 @@
 PROG=	chkgrp
 MAN=	chkgrp.8
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
index 63c5a22f05da..97972e5684ed 100644
--- a/usr.sbin/chown/Makefile
+++ b/usr.sbin/chown/Makefile
@@ -5,6 +5,4 @@ PROG=	chown
 LINKS=	${BINDIR}/chown /usr/bin/chgrp
 MAN=	chgrp.1 chown.8
 
-WARNS?=	5
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile
index d28de6668e26..652de797cec4 100644
--- a/usr.sbin/chroot/Makefile
+++ b/usr.sbin/chroot/Makefile
@@ -4,6 +4,4 @@
 PROG=	chroot
 MAN=	chroot.8
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/clear_locks/Makefile b/usr.sbin/clear_locks/Makefile
index dace0e16668c..00ff3ce95adc 100644
--- a/usr.sbin/clear_locks/Makefile
+++ b/usr.sbin/clear_locks/Makefile
@@ -4,6 +4,5 @@ PROG=	clear_locks
 MAN=	clear_locks.8
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
-WARNS=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index ac828818e367..6faf8475e9be 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -9,7 +9,6 @@ SRCS=	config.y main.c lang.l mkmakefile.c mkheaders.c \
 kernconf.c: kernconf.tmpl
 	file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
 
-WARNS?=	6
 CFLAGS+= -I. -I${.CURDIR}
 
 DPADD=	${LIBL} ${LIBSBUF}
diff --git a/usr.sbin/cpucontrol/Makefile b/usr.sbin/cpucontrol/Makefile
index 00e721406ec0..a048dd77c3db 100644
--- a/usr.sbin/cpucontrol/Makefile
+++ b/usr.sbin/cpucontrol/Makefile
@@ -4,6 +4,4 @@ PROG=	cpucontrol
 MAN=	cpucontrol.8
 SRCS=	cpucontrol.c intel.c amd.c
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
index 77ca47a1dc09..d9a1d247d41e 100644
--- a/usr.sbin/cron/cron/Makefile
+++ b/usr.sbin/cron/cron/Makefile
@@ -9,4 +9,6 @@ CFLAGS+= -DLOGIN_CAP -DPAM
 DPADD=	${LIBCRON} ${LIBPAM} ${LIBUTIL}
 LDADD=	${LIBCRON} ${MINUSLPAM} -lutil
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/crunch/Makefile.inc b/usr.sbin/crunch/Makefile.inc
index f8ffe675db6e..36175b7e5258 100644
--- a/usr.sbin/crunch/Makefile.inc
+++ b/usr.sbin/crunch/Makefile.inc
@@ -2,3 +2,5 @@
 
 # modify to taste
 BINDIR?= /usr/bin
+
+WARNS?=	2
diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile
index c0cf79a64d92..cc2c9b978e7b 100644
--- a/usr.sbin/ctm/ctm/Makefile
+++ b/usr.sbin/ctm/ctm/Makefile
@@ -17,6 +17,8 @@ NOTYET=	ctm_ed.c
 LDADD=	-lmd
 DPADD=	${LIBMD}
 
+WARNS?=	2
+
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
 .endif
diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile b/usr.sbin/ctm/ctm_dequeue/Makefile
index 07a234f0599d..18dd52557d42 100644
--- a/usr.sbin/ctm/ctm_dequeue/Makefile
+++ b/usr.sbin/ctm/ctm_dequeue/Makefile
@@ -8,4 +8,6 @@ SRCS=	ctm_dequeue.c error.c
 
 CFLAGS+= -I${.CURDIR}/../ctm_rmail
 
+WARNS?=	1
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ctm/ctm_rmail/Makefile b/usr.sbin/ctm/ctm_rmail/Makefile
index e2052b9228c7..1278ab46fa08 100644
--- a/usr.sbin/ctm/ctm_rmail/Makefile
+++ b/usr.sbin/ctm/ctm_rmail/Makefile
@@ -5,4 +5,6 @@ MLINKS=	ctm_rmail.1 ctm_smail.1 \
 	ctm_rmail.1 ctm_dequeue.1
 SRCS=	ctm_rmail.c error.c
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ctm/ctm_smail/Makefile b/usr.sbin/ctm/ctm_smail/Makefile
index 980e9bf02d3e..15209e42b69e 100644
--- a/usr.sbin/ctm/ctm_smail/Makefile
+++ b/usr.sbin/ctm/ctm_smail/Makefile
@@ -8,4 +8,6 @@ SRCS=	ctm_smail.c error.c
 
 CFLAGS+= -I${.CURDIR}/../ctm_rmail
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/daemon/Makefile b/usr.sbin/daemon/Makefile
index 3ca3e91ad193..2def8037f2a7 100644
--- a/usr.sbin/daemon/Makefile
+++ b/usr.sbin/daemon/Makefile
@@ -6,6 +6,4 @@ MAN=	daemon.8
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dconschat/Makefile b/usr.sbin/dconschat/Makefile
index 47efe5274be1..2836a6678d86 100644
--- a/usr.sbin/dconschat/Makefile
+++ b/usr.sbin/dconschat/Makefile
@@ -8,4 +8,6 @@ CFLAGS+= -I${.CURDIR}/../../sys
 DPADD=  ${LIBKVM}
 LDADD=  -lkvm
 
+WARNS?=	1
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/devinfo/Makefile b/usr.sbin/devinfo/Makefile
index 52e4d6d279e2..2a2301bf545f 100644
--- a/usr.sbin/devinfo/Makefile
+++ b/usr.sbin/devinfo/Makefile
@@ -3,8 +3,6 @@
 PROG=	devinfo
 MAN=	devinfo.8
 
-WARNS?=	2
-
 DPADD=	${LIBDEVINFO}
 LDADD=	-ldevinfo
 
diff --git a/usr.sbin/digictl/Makefile b/usr.sbin/digictl/Makefile
index 029dfee11e53..cb3745b17d16 100644
--- a/usr.sbin/digictl/Makefile
+++ b/usr.sbin/digictl/Makefile
@@ -3,6 +3,4 @@
 PROG=	digictl
 MAN=	digictl.8
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/diskinfo/Makefile b/usr.sbin/diskinfo/Makefile
index 5ffa27f6f0d8..b16b9335c259 100644
--- a/usr.sbin/diskinfo/Makefile
+++ b/usr.sbin/diskinfo/Makefile
@@ -3,8 +3,6 @@
 PROG=	diskinfo
 MAN=	diskinfo.8
 
-WARNS?=	5
-
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
diff --git a/usr.sbin/dnssec-dsfromkey/Makefile b/usr.sbin/dnssec-dsfromkey/Makefile
index ee7c75e918a7..0b57eb530a86 100644
--- a/usr.sbin/dnssec-dsfromkey/Makefile
+++ b/usr.sbin/dnssec-dsfromkey/Makefile
@@ -17,6 +17,8 @@ CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
+WARNS?=		3
+
 MAN=		dnssec-dsfromkey.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dnssec-keyfromlabel/Makefile b/usr.sbin/dnssec-keyfromlabel/Makefile
index a698bffbdc9d..fd6a3413034c 100644
--- a/usr.sbin/dnssec-keyfromlabel/Makefile
+++ b/usr.sbin/dnssec-keyfromlabel/Makefile
@@ -17,6 +17,8 @@ CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
+WARNS?=		3
+
 MAN=		dnssec-keyfromlabel.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dnssec-keygen/Makefile b/usr.sbin/dnssec-keygen/Makefile
index 3ac90058106d..1bdf0c0b080e 100644
--- a/usr.sbin/dnssec-keygen/Makefile
+++ b/usr.sbin/dnssec-keygen/Makefile
@@ -17,6 +17,8 @@ CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
+WARNS?=		3
+
 MAN=		dnssec-keygen.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dnssec-signzone/Makefile b/usr.sbin/dnssec-signzone/Makefile
index 7c4ca65a78cc..70ddc3e0961e 100644
--- a/usr.sbin/dnssec-signzone/Makefile
+++ b/usr.sbin/dnssec-signzone/Makefile
@@ -17,6 +17,8 @@ CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
+WARNS?=		3
+
 MAN=		dnssec-signzone.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dumpcis/Makefile b/usr.sbin/dumpcis/Makefile
index 283de3a58387..7a5a590090da 100644
--- a/usr.sbin/dumpcis/Makefile
+++ b/usr.sbin/dumpcis/Makefile
@@ -5,6 +5,5 @@
 PROG=	dumpcis
 MAN=	dumpcis.8
 SRCS=	main.c readcis.c printcis.c
-WARNS?=	5
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile
index 93e3e0712228..92d8392bf1f8 100644
--- a/usr.sbin/editmap/Makefile
+++ b/usr.sbin/editmap/Makefile
@@ -10,6 +10,8 @@ MAN=	editmap.8
 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+= -DNEWDB -DNOT_SENDMAIL
 
+WARNS?=	2
+
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm
 LIBSM=		${LIBSMDIR}/libsm.a
 
diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile
index e5a3b12559aa..b8c35ae5ce37 100644
--- a/usr.sbin/edquota/Makefile
+++ b/usr.sbin/edquota/Makefile
@@ -4,6 +4,4 @@
 PROG=	edquota
 MAN=	edquota.8
 
-WARNS?=	4
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/eeprom/Makefile b/usr.sbin/eeprom/Makefile
index fa5f411d4428..61b48a2aab68 100644
--- a/usr.sbin/eeprom/Makefile
+++ b/usr.sbin/eeprom/Makefile
@@ -6,7 +6,6 @@ PROG=	eeprom
 MAN=	eeprom.8
 MANSUBDIR= /sparc64
 SRCS=	eeprom.c ofw_options.c ofw_util.c
-WARNS?=	6
 CFLAGS+= -I${.CURDIR}/../ofwdump
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/extattr/Makefile b/usr.sbin/extattr/Makefile
index ae349752d689..8e2b5f78e463 100644
--- a/usr.sbin/extattr/Makefile
+++ b/usr.sbin/extattr/Makefile
@@ -11,6 +11,4 @@ MLINKS+=	rmextattr.8 setextattr.8
 MLINKS+=	rmextattr.8 getextattr.8
 MLINKS+=	rmextattr.8 lsextattr.8
 
-WARNS?=	5
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile
index 5eb1945d3b94..496a8aa8c7c1 100644
--- a/usr.sbin/extattrctl/Makefile
+++ b/usr.sbin/extattrctl/Makefile
@@ -3,6 +3,4 @@
 PROG=	extattrctl
 MAN=	extattrctl.8
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/faithd/Makefile b/usr.sbin/faithd/Makefile
index e1898ed333a4..dec45b9645b0 100644
--- a/usr.sbin/faithd/Makefile
+++ b/usr.sbin/faithd/Makefile
@@ -20,4 +20,6 @@ SRCS=	faithd.c tcp.c ftp.c prefix.c
 
 CFLAGS+= -DHAVE_POLL_H
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/fdcontrol/Makefile b/usr.sbin/fdcontrol/Makefile
index e2b54aa06708..5f1426b18ba1 100644
--- a/usr.sbin/fdcontrol/Makefile
+++ b/usr.sbin/fdcontrol/Makefile
@@ -4,7 +4,6 @@
 
 PROG=	fdcontrol
 SRCS=	fdcontrol.c fdutil.c
-WARNS?=	6
 CFLAGS+= -I${.CURDIR}/../fdread
 MAN=	fdcontrol.8
 
diff --git a/usr.sbin/fdformat/Makefile b/usr.sbin/fdformat/Makefile
index a172811ec055..59cd124f50d0 100644
--- a/usr.sbin/fdformat/Makefile
+++ b/usr.sbin/fdformat/Makefile
@@ -5,7 +5,6 @@
 PROG=	fdformat
 SRCS=	fdformat.c fdutil.c
 
-WARNS?=	6
 CFLAGS+= -I${.CURDIR}/../fdread
 
 .if ${MACHINE} == "pc98"
diff --git a/usr.sbin/fdread/Makefile b/usr.sbin/fdread/Makefile
index 2868a3c38f03..e99c6205c4c3 100644
--- a/usr.sbin/fdread/Makefile
+++ b/usr.sbin/fdread/Makefile
@@ -3,8 +3,6 @@
 PROG=	fdread
 SRCS=	fdread.c fdutil.c
 
-WARNS?=	6
-
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
 .endif
diff --git a/usr.sbin/fdwrite/Makefile b/usr.sbin/fdwrite/Makefile
index ba6f047ff161..b97bdd444821 100644
--- a/usr.sbin/fdwrite/Makefile
+++ b/usr.sbin/fdwrite/Makefile
@@ -8,6 +8,5 @@
 # $FreeBSD$
 
 PROG=	fdwrite
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/fifolog/Makefile.inc b/usr.sbin/fifolog/Makefile.inc
index 7fb2a9e805c0..5ec27ddb4247 100644
--- a/usr.sbin/fifolog/Makefile.inc
+++ b/usr.sbin/fifolog/Makefile.inc
@@ -2,8 +2,6 @@
 
 LIBFIFOLOG= ${.OBJDIR}/../lib/libfifolog.a
 
-WARNS?=	6
-
 #LINT=	flint
 #LINTFLAGS= ${.CURDIR}/../flint.lnt -I/usr/include
 
diff --git a/usr.sbin/ftp-proxy/libevent/Makefile b/usr.sbin/ftp-proxy/libevent/Makefile
index acc546fe6068..a8ff09b9ba5f 100644
--- a/usr.sbin/ftp-proxy/libevent/Makefile
+++ b/usr.sbin/ftp-proxy/libevent/Makefile
@@ -22,4 +22,6 @@ CFLAGS+= -I${.CURDIR} \
 	-DHAVE_WORKING_KQUEUE \
 	-DVERSION='"1.3b"'
 
+WARNS?=	2
+
 .include <bsd.lib.mk>
diff --git a/usr.sbin/getfmac/Makefile b/usr.sbin/getfmac/Makefile
index ad496570afdd..f9fa1b2e4462 100644
--- a/usr.sbin/getfmac/Makefile
+++ b/usr.sbin/getfmac/Makefile
@@ -3,6 +3,4 @@
 PROG=   getfmac
 MAN=	getfmac.8
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/getpmac/Makefile b/usr.sbin/getpmac/Makefile
index 87e6d28889ca..597472866526 100644
--- a/usr.sbin/getpmac/Makefile
+++ b/usr.sbin/getpmac/Makefile
@@ -3,6 +3,4 @@
 PROG=   getpmac
 MAN=	getpmac.8
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/gstat/Makefile b/usr.sbin/gstat/Makefile
index a02cf4658f27..2a6da4089afa 100644
--- a/usr.sbin/gstat/Makefile
+++ b/usr.sbin/gstat/Makefile
@@ -2,7 +2,6 @@
 
 PROG=	gstat
 MAN=	gstat.8
-WARNS?=	5
 DPADD=	${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBEDIT} ${LIBCURSES}
 LDADD=	-ldevstat -lkvm -lgeom -lbsdxml -lsbuf -ledit -lcurses
 
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index 35f2c222e583..29aacd1813d6 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -8,7 +8,7 @@ MAN=	inetd.8
 MLINKS=	inetd.8 inetd.conf.5
 SRCS=	inetd.c builtins.c
 
-WARNS?=	2
+WARNS?=	3
 CFLAGS+= -DLOGIN_CAP
 #CFLAGS+= -DSANITY_CHECK
 
diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile
index 558b09bbd6cc..9fd4809a5455 100644
--- a/usr.sbin/iostat/Makefile
+++ b/usr.sbin/iostat/Makefile
@@ -7,4 +7,6 @@ MAN=	iostat.8
 DPADD=	${LIBDEVSTAT} ${LIBKVM} ${LIBM}
 LDADD=	-ldevstat -lkvm -lm
 
+WARNS?=	1
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ip6addrctl/Makefile b/usr.sbin/ip6addrctl/Makefile
index cd2510eb0e19..93a299056f99 100644
--- a/usr.sbin/ip6addrctl/Makefile
+++ b/usr.sbin/ip6addrctl/Makefile
@@ -3,4 +3,6 @@
 PROG=	ip6addrctl
 MAN=	ip6addrctl.8
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ipfwpcap/Makefile b/usr.sbin/ipfwpcap/Makefile
index 5615eb1d4646..d16f888c67a6 100644
--- a/usr.sbin/ipfwpcap/Makefile
+++ b/usr.sbin/ipfwpcap/Makefile
@@ -11,8 +11,6 @@ DPADD=	${LIBPCAP}
 
 MAN=	ipfwpcap.8
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
 
 test:	$(CMD)
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index 74fd6c47b1e1..de35dcf248fc 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -7,8 +7,6 @@ MAN=	jail.8
 DPADD=	${LIBJAIL} ${LIBUTIL}
 LDADD=	-ljail -lutil
 
-WARNS?=	6
-
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
 .endif
diff --git a/usr.sbin/jexec/Makefile b/usr.sbin/jexec/Makefile
index d55ea0fc1170..7a2e6821e42a 100644
--- a/usr.sbin/jexec/Makefile
+++ b/usr.sbin/jexec/Makefile
@@ -4,6 +4,5 @@ PROG=	jexec
 MAN=	jexec.8
 DPADD=	${LIBJAIL} ${LIBUTIL}
 LDADD=	-ljail -lutil
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/jls/Makefile b/usr.sbin/jls/Makefile
index 2d02c560ac4e..e1157afbca14 100644
--- a/usr.sbin/jls/Makefile
+++ b/usr.sbin/jls/Makefile
@@ -5,6 +5,4 @@ MAN=	jls.8
 DPADD=	${LIBJAIL}
 LDADD=	-ljail
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/kernbb/Makefile b/usr.sbin/kernbb/Makefile
index 7da462b4f3b5..f3bf37cfa669 100644
--- a/usr.sbin/kernbb/Makefile
+++ b/usr.sbin/kernbb/Makefile
@@ -8,6 +8,5 @@ LDADD=	-lkvm
 
 CFLAGS+= -I${.CURDIR}/../../contrib/gcc
 
-WARNS?=	3
 .include <bsd.prog.mk>
 
diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile
index ab87f4bd3e5a..4c65ab99ad30 100644
--- a/usr.sbin/lastlogin/Makefile
+++ b/usr.sbin/lastlogin/Makefile
@@ -6,6 +6,4 @@ MAN=	lastlogin.8
 DPADD=	${LIBULOG}
 LDADD=	-lulog
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lmcconfig/Makefile b/usr.sbin/lmcconfig/Makefile
index b75ec2c8ce8b..842431accccf 100644
--- a/usr.sbin/lmcconfig/Makefile
+++ b/usr.sbin/lmcconfig/Makefile
@@ -6,4 +6,6 @@ MAN=	lmcconfig.8
 DPADD=	${LIBNETGRAPH}
 LDADD=	-lnetgraph
 
+WARNS?=	0
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile
index 14db0b77b798..4f148f9d4c46 100644
--- a/usr.sbin/lpr/common_source/Makefile
+++ b/usr.sbin/lpr/common_source/Makefile
@@ -10,4 +10,6 @@ INTERNALLIB=
 SRCS=		common.c ctlinfo.c displayq.c matchjobs.c net.c \
 		printcap.c request.c rmjob.c startdaemon.c
 
+WARNS?=		1
+
 .include <bsd.lib.mk>
diff --git a/usr.sbin/lpr/filters.ru/Makefile.inc b/usr.sbin/lpr/filters.ru/Makefile.inc
index a312e73941ec..36a6f4641306 100644
--- a/usr.sbin/lpr/filters.ru/Makefile.inc
+++ b/usr.sbin/lpr/filters.ru/Makefile.inc
@@ -1,3 +1,5 @@
 # $FreeBSD$
 
 BINDIR=	/usr/libexec/lpr/ru
+
+WARNS?=	3
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index f050857dd031..35fa52ab138a 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -11,6 +11,8 @@ BINMODE= 2555
 
 CFLAGS+= -I${.CURDIR}/../common_source
 
+WARNS?=	0
+
 DPADD=	${LIBLPR} ${LIBEDIT} ${LIBTERMCAP}
 LDADD=	${LIBLPR} -ledit -ltermcap
 
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index 9af36556604c..0d7d93ef79d9 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -7,6 +7,8 @@ SRCS=	lpd.c printjob.c recvjob.c lpdchar.c modes.c
 
 CFLAGS+= -I${.CURDIR}/../common_source
 
+WARNS?=	1
+
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}
 
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index 1ff376de4cd4..1894b0089c04 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -13,6 +13,8 @@ BINMODE= 6555
 
 CFLAGS+= -I${.CURDIR}/../common_source
 
+WARNS?=	2
+
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}
 
diff --git a/usr.sbin/lptcontrol/Makefile b/usr.sbin/lptcontrol/Makefile
index 3f7a939a7e17..0cff6202fafa 100644
--- a/usr.sbin/lptcontrol/Makefile
+++ b/usr.sbin/lptcontrol/Makefile
@@ -3,6 +3,4 @@
 PROG=	lptcontrol
 MAN=	lptcontrol.8
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile
index 86137b09c697..bd72fc6c5b76 100644
--- a/usr.sbin/mailstats/Makefile
+++ b/usr.sbin/mailstats/Makefile
@@ -11,6 +11,8 @@ MAN=	mailstats.8
 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+= -DNOT_SENDMAIL
 
+WARNS?=	2
+
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm
 LIBSM=		${LIBSMDIR}/libsm.a
 
diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index 252f5e772413..3f305f773e70 100644
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -8,7 +8,6 @@ MAN=	mailwrapper.8
 
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
-WARNS?=	6
 .endif
 
 .if ${MK_MAILWRAPPER} != "no" || ${MK_SENDMAIL} != "no"
diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile
index 5d30c67ae634..80cafcbcfdba 100644
--- a/usr.sbin/makemap/Makefile
+++ b/usr.sbin/makemap/Makefile
@@ -11,6 +11,8 @@ MAN=	makemap.8
 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+= -DNEWDB -DNOT_SENDMAIL
 
+WARNS?=	2
+
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm
 LIBSM=		${LIBSMDIR}/libsm.a
 
diff --git a/usr.sbin/memcontrol/Makefile b/usr.sbin/memcontrol/Makefile
index 25009dbb478f..d465d531a3e9 100644
--- a/usr.sbin/memcontrol/Makefile
+++ b/usr.sbin/memcontrol/Makefile
@@ -2,6 +2,5 @@
 
 PROG=	memcontrol
 MAN=	memcontrol.8
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile
index deb353941e4a..abc01822833b 100644
--- a/usr.sbin/mixer/Makefile
+++ b/usr.sbin/mixer/Makefile
@@ -3,6 +3,4 @@
 PROG=	mixer
 MAN=	mixer.8
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/mld6query/Makefile b/usr.sbin/mld6query/Makefile
index 0e9da4926104..1d4b44343fdd 100644
--- a/usr.sbin/mld6query/Makefile
+++ b/usr.sbin/mld6query/Makefile
@@ -20,4 +20,6 @@ SRCS=	mld6.c
 
 CFLAGS+= -DIPSEC -DUSE_RFC2292BIS
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/mlxcontrol/Makefile b/usr.sbin/mlxcontrol/Makefile
index 95964a5854ff..038544b21423 100644
--- a/usr.sbin/mlxcontrol/Makefile
+++ b/usr.sbin/mlxcontrol/Makefile
@@ -6,4 +6,6 @@ SRCS=	command.c config.c interface.c util.c
 
 CFLAGS+= -I${.CURDIR}/../../sys
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/mount_smbfs/Makefile b/usr.sbin/mount_smbfs/Makefile
index ade4fad2f1cf..9b7394411bbd 100644
--- a/usr.sbin/mount_smbfs/Makefile
+++ b/usr.sbin/mount_smbfs/Makefile
@@ -2,7 +2,6 @@
 
 PROG=	mount_smbfs
 SRCS=	mount_smbfs.c getmntopts.c
-WARNS?=	6
 MAN=	mount_smbfs.8
 
 MOUNTDIR=	${.CURDIR}/../../sbin/mount
diff --git a/usr.sbin/moused/Makefile b/usr.sbin/moused/Makefile
index 623954efce42..a313a213ac80 100644
--- a/usr.sbin/moused/Makefile
+++ b/usr.sbin/moused/Makefile
@@ -3,8 +3,6 @@
 PROG=	moused
 MAN=	moused.8
 
-WARNS?=6
-
 DPADD=	${LIBUTIL}  ${LIBM}
 LDADD=	-lutil -lm
 
diff --git a/usr.sbin/mptable/Makefile b/usr.sbin/mptable/Makefile
index a9221f979c6d..cff7602f1e66 100644
--- a/usr.sbin/mptable/Makefile
+++ b/usr.sbin/mptable/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 PROG=	mptable
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index b66c8bbeed8d..cbc4fd9f1870 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -8,8 +8,6 @@ MAN=	mtree.8 mtree.5
 SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
 SRCS+=	specspec.c
 
-WARNS?=	4
-
 CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
 DPADD=	${LIBMD}
 LDADD=	-lmd
diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile
index 8728b4ad15e9..618cc1389d1c 100644
--- a/usr.sbin/named-checkconf/Makefile
+++ b/usr.sbin/named-checkconf/Makefile
@@ -14,6 +14,8 @@ SRCS+=		named-checkconf.c check-tool.c
 
 CFLAGS+=	-I${LIB_BIND_DIR}
 
+WARNS?=		3
+
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
diff --git a/usr.sbin/named-checkzone/Makefile b/usr.sbin/named-checkzone/Makefile
index 169c00adce4e..05cc9f23f954 100644
--- a/usr.sbin/named-checkzone/Makefile
+++ b/usr.sbin/named-checkzone/Makefile
@@ -14,6 +14,8 @@ SRCS+=		named-checkzone.c check-tool.c
 
 CFLAGS+=	-I${LIB_BIND_DIR}
 
+WARNS?=		3
+
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index 608866a4466e..296afe916399 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -51,6 +51,8 @@ CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
 # Remove the date stamp to make it more obvious when real changes happen
 CFLAGS+=	-U__DATE__
 
+WARNS?=		0
+
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile
index f1566919a2f2..552ac5375cf0 100644
--- a/usr.sbin/ndp/Makefile
+++ b/usr.sbin/ndp/Makefile
@@ -22,4 +22,6 @@ SRCS=	ndp.c gmt2local.c
 CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../contrib/tcpdump
 CFLAGS+= -D_U_=""
 
+WARNS?=	1
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile
index 9c301a1b9d1d..ebc297b4cf2a 100644
--- a/usr.sbin/newsyslog/Makefile
+++ b/usr.sbin/newsyslog/Makefile
@@ -4,6 +4,4 @@ PROG=	newsyslog
 MAN=	newsyslog.8 newsyslog.conf.5
 SRCS=	newsyslog.c ptimes.c
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile
index 3237ce3f9c63..290506773d76 100644
--- a/usr.sbin/nfsd/Makefile
+++ b/usr.sbin/nfsd/Makefile
@@ -4,6 +4,4 @@
 PROG=	nfsd
 MAN=	nfsd.8 nfsv4.4 stablerestart.5
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/nghook/Makefile b/usr.sbin/nghook/Makefile
index 73f2df3bf935..e427f2603cc9 100644
--- a/usr.sbin/nghook/Makefile
+++ b/usr.sbin/nghook/Makefile
@@ -4,7 +4,6 @@
 PROG=	nghook
 MAN=	nghook.8
 SRCS=	main.c
-WARNS?=	6
 
 DPADD=	${LIBNETGRAPH}
 LDADD=	-lnetgraph
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index f81905a418af..5095e89bbfbc 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -18,4 +18,6 @@ LIBOPTS=	${.OBJDIR}/../libopts/libopts.a
 LIBPARSE=	${.OBJDIR}/../libparse/libparse.a
 LIBNTP=	${.OBJDIR}/../libntp/libntp.a
 
+WARNS?=	0
+
 .include "../Makefile.inc"
diff --git a/usr.sbin/nvram/Makefile b/usr.sbin/nvram/Makefile
index 3cca03756507..2c6e43c8fcb4 100644
--- a/usr.sbin/nvram/Makefile
+++ b/usr.sbin/nvram/Makefile
@@ -4,6 +4,4 @@ PROG=	nvram
 MAN=	nvram.8
 MANSUBDIR= /powerpc
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ofwdump/Makefile b/usr.sbin/ofwdump/Makefile
index a20e94f9b335..ca4f4868db53 100644
--- a/usr.sbin/ofwdump/Makefile
+++ b/usr.sbin/ofwdump/Makefile
@@ -4,6 +4,4 @@ PROG=	ofwdump
 MAN=	ofwdump.8
 SRCS=	ofwdump.c ofw_util.c
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pciconf/Makefile b/usr.sbin/pciconf/Makefile
index e57e736fe2c1..9fbec00ce0e2 100644
--- a/usr.sbin/pciconf/Makefile
+++ b/usr.sbin/pciconf/Makefile
@@ -7,4 +7,6 @@ MAN=	pciconf.8
 
 CFLAGS+= -I${.CURDIR}/../../sys
 
+WARNS?=	3
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile
index c346ea705d79..c9a0fdebea22 100644
--- a/usr.sbin/pkg_install/delete/Makefile
+++ b/usr.sbin/pkg_install/delete/Makefile
@@ -5,7 +5,6 @@ SRCS=	main.c perform.c
 
 CFLAGS+= -I${.CURDIR}/../lib
 
-WARNS?=	6
 WFORMAT?=	1
 
 DPADD=	${LIBINSTALL} ${LIBMD}
diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile
index 675f7ca454ac..485cb2263210 100644
--- a/usr.sbin/pkg_install/info/Makefile
+++ b/usr.sbin/pkg_install/info/Makefile
@@ -5,7 +5,6 @@ SRCS=	main.c perform.c show.c
 
 CFLAGS+= -I${.CURDIR}/../lib
 
-WARNS?=	6
 WFORMAT?=	1
 
 DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
diff --git a/usr.sbin/pkg_install/updating/Makefile b/usr.sbin/pkg_install/updating/Makefile
index cf8bfc8718c0..b0d3689779e6 100644
--- a/usr.sbin/pkg_install/updating/Makefile
+++ b/usr.sbin/pkg_install/updating/Makefile
@@ -5,7 +5,6 @@ SRCS=	main.c
 
 CFLAGS+= -I${.CURDIR}/../lib
 
-WARNS?=	6
 WFORMAT?= 1
 
 DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile
index 71168ee3d23f..3e1d7a522f27 100644
--- a/usr.sbin/pkg_install/version/Makefile
+++ b/usr.sbin/pkg_install/version/Makefile
@@ -5,7 +5,6 @@ SRCS=	main.c perform.c
 
 CFLAGS+= -I${.CURDIR}/../lib
 
-WARNS?=	6
 WFORMAT?=	1
 
 DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
diff --git a/usr.sbin/pmcannotate/Makefile b/usr.sbin/pmcannotate/Makefile
index e087bb3c28e7..cff1efb5ccfa 100644
--- a/usr.sbin/pmcannotate/Makefile
+++ b/usr.sbin/pmcannotate/Makefile
@@ -5,8 +5,6 @@
 PROG=	pmcannotate
 MAN=	pmcannotate.8
 
-WARNS?=	6
-
 SRCS=	pmcannotate.c
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pmccontrol/Makefile b/usr.sbin/pmccontrol/Makefile
index 9dafe1c3fbd5..0f6dc768d8eb 100644
--- a/usr.sbin/pmccontrol/Makefile
+++ b/usr.sbin/pmccontrol/Makefile
@@ -8,8 +8,6 @@ MAN=	pmccontrol.8
 DPADD=	${LIBPMC}
 LDADD=	-lpmc
 
-WARNS?=	6
-
 SRCS=	pmccontrol.c
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pmcstat/Makefile b/usr.sbin/pmcstat/Makefile
index 6b11d8d945af..c115c427c9b8 100644
--- a/usr.sbin/pmcstat/Makefile
+++ b/usr.sbin/pmcstat/Makefile
@@ -8,8 +8,6 @@ MAN=	pmcstat.8
 DPADD=	${LIBELF} ${LIBKVM} ${LIBPMC} ${LIBM}
 LDADD=	-lelf -lkvm -lpmc -lm
 
-WARNS?=	6
-
 SRCS=	pmcstat.c pmcstat.h pmcstat_log.c
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile
index 294b4f758d4f..164ef37790cf 100644
--- a/usr.sbin/pnpinfo/Makefile
+++ b/usr.sbin/pnpinfo/Makefile
@@ -11,4 +11,6 @@ CFLAGS+= -I${.CURDIR}/../../sys
 CFLAGS+= -DPC98
 .endif
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/portsnap/make_index/Makefile b/usr.sbin/portsnap/make_index/Makefile
index 65b1a8e61063..87768f6035ef 100644
--- a/usr.sbin/portsnap/make_index/Makefile
+++ b/usr.sbin/portsnap/make_index/Makefile
@@ -2,7 +2,6 @@
 
 PROG=	make_index
 NO_MAN=
-WARNS?=	6
 
 BINDIR=	${LIBEXECDIR}
 
diff --git a/usr.sbin/portsnap/phttpget/Makefile b/usr.sbin/portsnap/phttpget/Makefile
index 154ff15f9520..6f003e3b975a 100644
--- a/usr.sbin/portsnap/phttpget/Makefile
+++ b/usr.sbin/portsnap/phttpget/Makefile
@@ -2,7 +2,6 @@
 
 PROG=	phttpget
 NO_MAN=
-WARNS?=	6
 
 BINDIR=	${LIBEXECDIR}
 
diff --git a/usr.sbin/powerd/Makefile b/usr.sbin/powerd/Makefile
index 6adb188608aa..b1d8d112f610 100644
--- a/usr.sbin/powerd/Makefile
+++ b/usr.sbin/powerd/Makefile
@@ -2,7 +2,6 @@
 
 PROG=	powerd
 MAN=	powerd.8
-WARNS?=	6
 
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile
index 6cdcc3dc6cfb..2f2be4bb5035 100644
--- a/usr.sbin/pppctl/Makefile
+++ b/usr.sbin/pppctl/Makefile
@@ -3,6 +3,8 @@
 PROG=	pppctl
 MAN=	pppctl.8
 
+WARNS?=	2
+
 DPADD=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
 LDADD=	-lpthread -ledit -ltermcap
 
diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile
index 81fd4d1a11ac..120028d6997b 100644
--- a/usr.sbin/praliases/Makefile
+++ b/usr.sbin/praliases/Makefile
@@ -11,6 +11,8 @@ MAN=	praliases.8
 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+= -DNEWDB -DNOT_SENDMAIL
 
+WARNS?=	2
+
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm
 LIBSM=		${LIBSMDIR}/libsm.a
 
diff --git a/usr.sbin/praudit/Makefile b/usr.sbin/praudit/Makefile
index 4ff08fdfb164..6a61fd131e37 100644
--- a/usr.sbin/praudit/Makefile
+++ b/usr.sbin/praudit/Makefile
@@ -8,6 +8,8 @@ OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
 PROG=	praudit
 MAN=	praudit.1
 
+WARNS?=	3
+
 DPADD=	${LIBBSM}
 LDADD=	-lbsm
 
diff --git a/usr.sbin/procctl/Makefile b/usr.sbin/procctl/Makefile
index 5cb35e707371..880b93a13fe0 100644
--- a/usr.sbin/procctl/Makefile
+++ b/usr.sbin/procctl/Makefile
@@ -3,6 +3,4 @@
 PROG=	procctl
 MAN=	procctl.8
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile
index 4620ddee19f3..414708cee055 100644
--- a/usr.sbin/pstat/Makefile
+++ b/usr.sbin/pstat/Makefile
@@ -6,8 +6,6 @@ LINKS=	${BINDIR}/pstat ${BINDIR}/swapinfo
 MAN=	pstat.8
 MLINKS=	pstat.8 swapinfo.8
 
-WARNS?=	6
-
 DPADD=	${LIBKVM} ${LIBUTIL}
 LDADD=	-lkvm -lutil
 
diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile
index 8937124f22f4..ae0023c6a323 100644
--- a/usr.sbin/pw/Makefile
+++ b/usr.sbin/pw/Makefile
@@ -6,6 +6,8 @@ SRCS=	pw.c pw_conf.c pw_user.c pw_group.c pw_log.c pw_nis.c pw_vpw.c \
 	grupd.c pwupd.c fileupd.c edgroup.c psdate.c \
 	bitmap.c cpdir.c rm_r.c
 
+WARNS?=	1
+
 DPADD=	${LIBCRYPT} ${LIBUTIL}
 LDADD=	-lcrypt -lutil
 
diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index c3aaeb3398d8..7616629b2b09 100644
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@@ -7,7 +7,6 @@ PROG=	pwd_mkdb
 MAN=	pwd_mkdb.8
 SRCS=	pw_scan.c pwd_mkdb.c
 
-WARNS?=	4
 CFLAGS+= -I${.CURDIR}/../../lib/libc/gen		# for pw_scan.h
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile
index 3f88bd9da33c..984008cf8e80 100644
--- a/usr.sbin/quotaon/Makefile
+++ b/usr.sbin/quotaon/Makefile
@@ -6,6 +6,4 @@ LINKS=	${BINDIR}/quotaon ${BINDIR}/quotaoff
 MAN=	quotaon.8
 MLINKS=	quotaon.8 quotaoff.8
 
-WARNS?=	4
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile
index 087e890ed356..208abd6553a7 100644
--- a/usr.sbin/repquota/Makefile
+++ b/usr.sbin/repquota/Makefile
@@ -4,6 +4,4 @@
 PROG=	repquota
 MAN=	repquota.8
 
-WARNS?=	4
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
index e0ea62130bcc..fac902821974 100644
--- a/usr.sbin/rip6query/Makefile
+++ b/usr.sbin/rip6query/Makefile
@@ -4,7 +4,6 @@
 PROG=	rip6query
 MAN=	rip6query.8
 
-WARNS?=	2
 CFLAGS+= -I${.CURDIR}/../route6d
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile
index 579a02bb6689..8a678b6fa8b1 100644
--- a/usr.sbin/rmt/Makefile
+++ b/usr.sbin/rmt/Makefile
@@ -4,8 +4,6 @@
 PROG=	rmt
 MAN=	rmt.8
 
-WARNS?=	4
-
 # called from /usr/src/etc/Makefile
 etc-rmt:
 	rm -f ${DESTDIR}/etc/rmt
diff --git a/usr.sbin/rndc-confgen/Makefile b/usr.sbin/rndc-confgen/Makefile
index b8a52dd4d57a..08f2d7ed98f7 100644
--- a/usr.sbin/rndc-confgen/Makefile
+++ b/usr.sbin/rndc-confgen/Makefile
@@ -17,6 +17,8 @@ SRCS+=		rndc-confgen.c util.c
 
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR}
 
+WARNS?=		3
+
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile
index 2ca76976e5a9..9cd356f795f6 100644
--- a/usr.sbin/rndc/Makefile
+++ b/usr.sbin/rndc/Makefile
@@ -17,6 +17,8 @@ SRCS+=		rndc.c util.c
 
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR}
 
+WARNS?=		3
+
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
index 308aad761337..df23d33aea57 100644
--- a/usr.sbin/route6d/Makefile
+++ b/usr.sbin/route6d/Makefile
@@ -6,4 +6,6 @@ MAN=	route6d.8
 
 CFLAGS+= -DHAVE_POLL_H
 
+WARNS?=	1
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile
index 961ad17d4bf9..c81da8202798 100644
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@@ -7,7 +7,7 @@ MLINKS=	rpc.lockd.8 lockd.8
 SRCS=	kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c
 
 CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc
-#WARNS?= 2
+WARNS?= 0
 
 DPADD=	${LIBRPCSVC} ${LIBUTIL}
 LDADD=	-lrpcsvc -lutil
diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile
index 6d8053c29bed..e69a9d6e2096 100644
--- a/usr.sbin/rpc.statd/Makefile
+++ b/usr.sbin/rpc.statd/Makefile
@@ -5,7 +5,7 @@ MAN=	rpc.statd.8
 SRCS=	file.c sm_inter_svc.c sm_inter.h statd.c procs.c
 
 CFLAGS+= -I.
-#WARNS?= 2
+WARNS?= 2
 
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile
index 0a829c301cb5..fc4a3998c07c 100644
--- a/usr.sbin/rpc.umntall/Makefile
+++ b/usr.sbin/rpc.umntall/Makefile
@@ -5,6 +5,6 @@ PROG=	rpc.umntall
 MAN=	rpc.umntall.8
 SRCS=	rpc.umntall.c mounttab.c
 
-#WARNS?= 2
+WARNS?= 3
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index bbd2658bafdd..b6a0a8c8630a 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -14,7 +14,7 @@ SRCS=	util.c yp_access.c yp_dblookup.c yp_dbwrite.c \
 GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_private.h yppasswd_private_svc.c \
 	yppasswd_private_xdr.c yppasswd_svc.c
 
-WARNS?=	 4
+WARNS?=	 5
 CFLAGS+= -fno-strict-aliasing
 CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw \
 	 -I${.CURDIR}/../../usr.sbin/ypserv \
diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile
index 4fe19c9c9cab..fecb83760dd1 100644
--- a/usr.sbin/rpc.ypupdated/Makefile
+++ b/usr.sbin/rpc.ypupdated/Makefile
@@ -11,6 +11,8 @@ SRCS=	ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \
 #CFLAGS+= -DYP
 CFLAGS+= -I${.CURDIR}/../ypserv -I. -I${.CURDIR}/../../libexec/ypxfr
 
+WARNS?=	1
+
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
 
diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile
index 70729b12e67d..ee9e2425d1e9 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile
+++ b/usr.sbin/rpc.ypxfrd/Makefile
@@ -9,6 +9,8 @@ SRCS=	ypxfrd_svc.c ypxfrd.h ypxfrd_server.c yp_error.c \
 
 CFLAGS+= -I. -DXFRBLOCKSIZE=65535
 
+WARNS?=	2
+
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
 
diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile
index 3251378651a6..dd042f217a98 100644
--- a/usr.sbin/rpcbind/Makefile
+++ b/usr.sbin/rpcbind/Makefile
@@ -14,6 +14,8 @@ CFLAGS+= -DPORTMAP -DLIBWRAP
 CFLAGS+= -DINET6
 .endif
 
+WARNS?=	1
+
 DPADD=	${LIBWRAP} ${LIBUTIL}
 LDADD=	-lwrap -lutil
 
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile
index c31a7c7ce932..091e52878c3a 100644
--- a/usr.sbin/rrenumd/Makefile
+++ b/usr.sbin/rrenumd/Makefile
@@ -21,6 +21,8 @@ SRCS=	rrenumd.c  parser.y lexer.l
 CFLAGS+= -DIPSEC -I. -I${.CURDIR}
 YFLAGS=	-d
 
+WARNS?=	2
+
 LDADD=	-lipsec -ll -ly
 DPADD=	${LIBIPSEC} ${LIBL} ${LIBY}
 
diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile
index f7e2021cd1fe..90b45f102d8d 100644
--- a/usr.sbin/rtadvd/Makefile
+++ b/usr.sbin/rtadvd/Makefile
@@ -20,4 +20,6 @@ SRCS=	rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c
 
 CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO
 
+WARNS?=	1
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rtprio/Makefile b/usr.sbin/rtprio/Makefile
index ebc7bd1a37cc..b612f2bc974b 100644
--- a/usr.sbin/rtprio/Makefile
+++ b/usr.sbin/rtprio/Makefile
@@ -5,4 +5,6 @@ PROG=	rtprio
 LINKS=  ${BINDIR}/rtprio ${BINDIR}/idprio
 MLINKS= rtprio.1 idprio.1
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile
index 1afa0f6f4545..ad4059aad66e 100644
--- a/usr.sbin/rtsold/Makefile
+++ b/usr.sbin/rtsold/Makefile
@@ -21,6 +21,8 @@ SRCS=	rtsold.c rtsol.c if.c probe.c dump.c rtsock.c
 
 CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H
 
+WARNS?=	1
+
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 
diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile
index 6f99d56543fe..439a11c932be 100644
--- a/usr.sbin/rwhod/Makefile
+++ b/usr.sbin/rwhod/Makefile
@@ -4,8 +4,7 @@
 PROG=	rwhod
 MAN=	rwhod.8
 
-# XXX breaks on Alpha due to alignment constraints
-#WARNS?=	4
+WARNS?=	3
 
 DPADD=	${LIBULOG}
 LDADD=	-lulog
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index 718cbc846efe..0adf1f85e1fb 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -6,6 +6,4 @@ PROG=	sa
 MAN=	sa.8
 SRCS=	main.c db.c pdb.c usrdb.c readrec.c
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 0b89297d8d9c..067f5d99643b 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -43,6 +43,8 @@ CFLAGS+= ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
 CFLAGS+= -DNETINET6
 .endif
 
+WARNS?=	2
+
 DPADD=	${LIBUTIL} ${LIBWRAP}
 LDADD=	-lutil -lwrap
 
diff --git a/usr.sbin/setfmac/Makefile b/usr.sbin/setfmac/Makefile
index 34b979bdf138..bcbd85fe275e 100644
--- a/usr.sbin/setfmac/Makefile
+++ b/usr.sbin/setfmac/Makefile
@@ -4,6 +4,4 @@ PROG=   setfmac
 LINKS=	${BINDIR}/setfmac ${BINDIR}/setfsmac
 MAN=	setfmac.8 setfsmac.8
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/setpmac/Makefile b/usr.sbin/setpmac/Makefile
index ae7ee026e9fd..a8bc1acca26b 100644
--- a/usr.sbin/setpmac/Makefile
+++ b/usr.sbin/setpmac/Makefile
@@ -3,6 +3,4 @@
 PROG=   setpmac
 MAN=	setpmac.8
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/smbmsg/Makefile b/usr.sbin/smbmsg/Makefile
index a581b2cd35d2..2ae640442808 100644
--- a/usr.sbin/smbmsg/Makefile
+++ b/usr.sbin/smbmsg/Makefile
@@ -3,6 +3,5 @@
 
 PROG=	smbmsg
 MAN=	smbmsg.8
-WARNS=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index db61cae2d06a..bd08ac1dbe45 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -20,6 +20,8 @@ CFLAGS+= -DPC98
 .endif
 CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I.
 
+WARNS?=	1
+
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lutil -ldisk -lftpio
 
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index 2936984377a5..a49ffc60b748 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -15,6 +15,8 @@ CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
 CFLAGS+=-DINET6
 .endif
 
+WARNS?=	0
+
 DPADD=	${LIBWRAP}
 LDADD=	-lwrap
 
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index cbd61aa491e4..caae746805d8 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -14,6 +14,8 @@ CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
 CFLAGS+=-DINET6
 .endif
 
+WARNS?=	0
+
 DPADD=	${LIBWRAP}
 LDADD=	-lwrap
 
diff --git a/usr.sbin/tcpdrop/Makefile b/usr.sbin/tcpdrop/Makefile
index 44766eb9a0a3..2fc606a26392 100644
--- a/usr.sbin/tcpdrop/Makefile
+++ b/usr.sbin/tcpdrop/Makefile
@@ -3,6 +3,5 @@
 
 PROG=	tcpdrop
 MAN=	tcpdrop.8
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/tcpdump/Makefile.inc b/usr.sbin/tcpdump/Makefile.inc
index 1e4d46f113a5..6c4b6e22ba1c 100644
--- a/usr.sbin/tcpdump/Makefile.inc
+++ b/usr.sbin/tcpdump/Makefile.inc
@@ -2,3 +2,5 @@
 # $FreeBSD$
 
 BINDIR?=	/usr/sbin
+
+WARNS?=		3
diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index 489c862089e0..e73ff7f275ce 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -31,6 +31,8 @@ LDADD=	-lipsec
 
 CFLAGS+= -I${TRACEROUTE_DISTDIR}/lbl
 
+WARNS?=	0
+
 version.c: ${TRACEROUTE_DISTDIR}/VERSION
 	@rm -f ${.TARGET}
 	head -1 ${TRACEROUTE_DISTDIR}/VERSION | \
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index 60618a2ad408..e0b72a13cd03 100644
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@@ -25,6 +25,8 @@ BINMODE= 4555
 CFLAGS+= -DIPSEC -DUSE_RFC2292BIS -DHAVE_POLL
 CFLAGS+= -I${.CURDIR} -I${TRACEROUTE_DISTDIR} -I.
 
+WARNS?=	1
+
 DPADD=	${LIBIPSEC}
 LDADD=	-lipsec
 
diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index 0596967a07e2..a9da310fd86f 100644
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -5,6 +5,8 @@ MAN=	tzsetup.8
 
 CFLAGS+= -I${.CURDIR}
 
+WARNS?=	3
+
 DPADD=	${LIBDIALOG} ${LIBNCURSES}
 LDADD=	-ldialog -lncurses
 
diff --git a/usr.sbin/uathload/Makefile b/usr.sbin/uathload/Makefile
index 3083704d3bb7..4f9b99d6b185 100644
--- a/usr.sbin/uathload/Makefile
+++ b/usr.sbin/uathload/Makefile
@@ -5,8 +5,6 @@ MAN=	uathload.8
 
 SRCS=	uathload.c ar5523.bin
 
-WARNS?= 4
-
 CLEANFILES=	ar5523.bin
 
 ar5523.bin: ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu
diff --git a/usr.sbin/usbdevs/Makefile b/usr.sbin/usbdevs/Makefile
index 985bc7a61ab5..3cfc8ef002d8 100644
--- a/usr.sbin/usbdevs/Makefile
+++ b/usr.sbin/usbdevs/Makefile
@@ -4,6 +4,4 @@
 PROG=	usbdevs
 MAN=	usbdevs.8
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/vidcontrol/Makefile b/usr.sbin/vidcontrol/Makefile
index 074f941d85b9..8c8f6bb804b2 100644
--- a/usr.sbin/vidcontrol/Makefile
+++ b/usr.sbin/vidcontrol/Makefile
@@ -3,6 +3,4 @@
 PROG=	vidcontrol
 SRCS=	vidcontrol.c decode.c
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile
index 69a9df9c5ba9..d98e4019adea 100644
--- a/usr.sbin/vipw/Makefile
+++ b/usr.sbin/vipw/Makefile
@@ -4,8 +4,6 @@
 PROG=	vipw
 MAN=	vipw.8
 
-WARNS?=	4
-
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
diff --git a/usr.sbin/wake/Makefile b/usr.sbin/wake/Makefile
index ee303af05617..938fc663e0fd 100644
--- a/usr.sbin/wake/Makefile
+++ b/usr.sbin/wake/Makefile
@@ -2,6 +2,5 @@
 
 PROG=	wake
 MAN=	wake.8
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/watchdogd/Makefile b/usr.sbin/watchdogd/Makefile
index 08880e149168..be69d2bf5a84 100644
--- a/usr.sbin/watchdogd/Makefile
+++ b/usr.sbin/watchdogd/Makefile
@@ -3,7 +3,6 @@
 PROG=	watchdogd
 LINKS=	${BINDIR}/watchdogd ${BINDIR}/watchdog
 MAN=	watchdogd.8 watchdog.8
-WARNS?=	6
 
 LDADD=	-lm -lutil
 DPADD=	${LIBM} ${LIBUTIL}
diff --git a/usr.sbin/wlandebug/Makefile b/usr.sbin/wlandebug/Makefile
index 5284257d7f70..e916c23e7512 100644
--- a/usr.sbin/wlandebug/Makefile
+++ b/usr.sbin/wlandebug/Makefile
@@ -3,4 +3,6 @@
 PROG=	wlandebug
 MAN=	wlandebug.8
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wlconfig/Makefile b/usr.sbin/wlconfig/Makefile
index 8d3d0cc3e797..8bc62629a0d8 100644
--- a/usr.sbin/wlconfig/Makefile
+++ b/usr.sbin/wlconfig/Makefile
@@ -4,4 +4,6 @@ PROG=	wlconfig
 MAN=	wlconfig.8
 MANSUBDIR= /i386
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile
index 973da6ee0559..1c41105bde94 100644
--- a/usr.sbin/yp_mkdb/Makefile
+++ b/usr.sbin/yp_mkdb/Makefile
@@ -9,4 +9,6 @@ SRCS=	yp_mkdb.c yp_dblookup.c yp_dbwrite.c
 CFLAGS+= -Dyp_error=warnx
 CFLAGS+= -I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.sbin/ypserv
 
+WARNS?=	1
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile
index 915d001be4dc..8e9a231940c4 100644
--- a/usr.sbin/ypbind/Makefile
+++ b/usr.sbin/ypbind/Makefile
@@ -7,4 +7,6 @@ SRCS=	ypbind.c yp_ping.c
 
 CFLAGS+= -DDAEMON
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile
index 63763316ef8c..701633ba086e 100644
--- a/usr.sbin/yppoll/Makefile
+++ b/usr.sbin/yppoll/Makefile
@@ -4,4 +4,6 @@
 PROG=	yppoll
 MAN=	yppoll.8
 
+WARNS?=	3
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile
index 7ce1c612e0e0..887a80b92d0a 100644
--- a/usr.sbin/yppush/Makefile
+++ b/usr.sbin/yppush/Makefile
@@ -12,6 +12,8 @@ GENSRCS=yp.h yp_clnt.c yppush_svc.c
 
 CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr
 
+WARNS?=	2
+
 RPCGEN= rpcgen -C
 
 CLEANFILES= ${GENSRCS}
diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile
index c1b2df30478b..73a6195db36e 100644
--- a/usr.sbin/ypserv/Makefile
+++ b/usr.sbin/ypserv/Makefile
@@ -10,6 +10,8 @@ SRCS=	yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
 
 CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I.
 
+WARNS?=	0
+
 DPADD=	${LIBWRAP}
 LDADD=	-lwrap
 
diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile
index 10ed5f88fd78..708ff871e80c 100644
--- a/usr.sbin/ypset/Makefile
+++ b/usr.sbin/ypset/Makefile
@@ -4,4 +4,6 @@
 PROG=	ypset
 MAN=	ypset.8
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/zic/zdump/Makefile b/usr.sbin/zic/zdump/Makefile
index 3443b158e6d5..7ee8db324927 100644
--- a/usr.sbin/zic/zdump/Makefile
+++ b/usr.sbin/zic/zdump/Makefile
@@ -10,4 +10,6 @@ CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
 CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir
 CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/zic/zic/Makefile b/usr.sbin/zic/zic/Makefile
index 3f3bc70aa55c..02dc6e2d710e 100644
--- a/usr.sbin/zic/zic/Makefile
+++ b/usr.sbin/zic/zic/Makefile
@@ -11,4 +11,6 @@ CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir
 CFLAGS+= -DHAVE_STRERROR -DHAVE_UNISTD_H
 CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime
 
+WARNS?=	2
+
 .include <bsd.prog.mk>