diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index f561f8aead3..fe9d08c1486 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -50,6 +50,9 @@ CWARNEXTRA?=	-Wno-error=inline -Wno-error=enum-compare -Wno-error=unused-but-set
 		-Wno-error=array-bounds -Wno-error=address \
 		-Wno-error=cast-qual -Wno-error=sequence-point -Wno-error=attributes \
 		-Wno-error=strict-overflow -Wno-error=overflow
+.if ${COMPILER_VERSION} >= 60100
+CWARNEXTRA+=	-Wno-error=nonnull-compare -Wno-error=shift-overflow=
+.endif
 .else
 # For gcc 4.2, eliminate the too-often-wrong warnings about uninitialized vars.
 CWARNEXTRA?=	-Wno-uninitialized