diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index bf65d1c1a507..ad788a4745a8 100644
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@@ -11,7 +11,7 @@ PROG=	rmail
 SRCS=	rmail.c
 MAN=	rmail.8
 
-WARNS?=	0
+WARNS?=	2
 CFLAGS+=-I${SENDMAIL_DIR}/include -I.
 
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 43990b41af6f..c53f094918bd 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -4,8 +4,7 @@ PROG_CXX=devd
 SRCS=	devd.cc token.l parse.y y.tab.h
 MAN=	devd.8 devd.conf.5
 
-WARNS=	0
-#WARNS?=	4
+WARNS?=	3
 
 NO_SHARED?=YES
 
diff --git a/sbin/devfs/Makefile b/sbin/devfs/Makefile
index 95d2540272e6..29b0f54fbc5f 100644
--- a/sbin/devfs/Makefile
+++ b/sbin/devfs/Makefile
@@ -3,6 +3,5 @@
 PROG=	devfs
 SRCS=	devfs.c rule.c
 MAN=	devfs.8
-WARNS?=	5
 
 .include <bsd.prog.mk>
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index a1ffef7989a0..88b267dbe49d 100644
--- a/sbin/ffsinfo/Makefile
+++ b/sbin/ffsinfo/Makefile
@@ -11,7 +11,7 @@ PROG=	ffsinfo
 SRCS=	ffsinfo.c debug.c
 MAN=	ffsinfo.8
 
-WARNS?=	0
+WARNS?=	1
 CFLAGS+=-DFS_DEBUG -I${GROWFS}
 DPADD=	${LIBUFS}
 LDADD=	-lufs
diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile
index 87058028533e..0faa6ba6d397 100644
--- a/sbin/gbde/Makefile
+++ b/sbin/gbde/Makefile
@@ -9,9 +9,7 @@ SRCS+=	g_bde_lock.c
 
 # rijndael-fst.c does evil casting things which results in warnings on
 # 64 bit machines, the test-vectors check out however, so it works right.
-.if ${MACHINE_ARCH} == "i386"
-WARNS?=	5
-.else
+.if ${MACHINE_ARCH} != "i386"
 WARNS?=	3
 .endif
 
diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile
index d28d3a595377..63235b2ce6e4 100644
--- a/sbin/mknod/Makefile
+++ b/sbin/mknod/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PROG=	mknod
-WARNS?=	0
 MAN=	mknod.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_std/Makefile b/sbin/mount_std/Makefile
index 110a5256cf22..44ff9ef6eb64 100644
--- a/sbin/mount_std/Makefile
+++ b/sbin/mount_std/Makefile
@@ -11,7 +11,7 @@ MLINKS=	mount_std.8 mount_devfs.8 \
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${MOUNT}
-WARNS?=	0
+WARNS?=	3
 
 .PATH:	${MOUNT}
 
diff --git a/sbin/sunlabel/Makefile b/sbin/sunlabel/Makefile
index 143b6c72bb0f..9eb1a3257091 100644
--- a/sbin/sunlabel/Makefile
+++ b/sbin/sunlabel/Makefile
@@ -11,8 +11,6 @@ LINKS=	${BINDIR}/sunlabel ${BINDIR}/disklabel
 MLINKS=	sunlabel.8 disklabel.8
 .endif
 
-WARNS?=	5
-
 DPADD=	${LIBGEOM}
 LDADD=	-lgeom