diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index f32f980ff32e..6d40e80210a8 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -21,7 +21,6 @@ CFLAGS		+=	-std=iso9899:1999
 .  else
 CFLAGS		+=	-std=${CSTD}
 .  endif
-CFLAGS		+=	-pedantic
 . endif
 . if defined(WARNS)
 .  if ${WARNS} > 0
@@ -41,6 +40,9 @@ CFLAGS		+=	-Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-al
 .  endif
 # BDECFLAGS
 .  if ${WARNS} > 5
+.   if defined(CSTD)
+CFLAGS		+=	-pedantic
+.   endif
 CFLAGS		+=	-Wbad-function-cast -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls
 .  endif
 .  if ${WARNS} > 1 && ${WARNS} < 5