diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 96142277a111..24e839477a9a 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.184 2006/07/23 11:41:27 lukem Exp $
+#	$NetBSD: bsd.README,v 1.185 2006/10/08 17:16:51 elad Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the new make "include" files for the BSD
@@ -1386,17 +1386,6 @@ WARNS		Crank up gcc warning options; the distinct levels are:
 			WARNS=3
 			WARNS=4
 
-FORMAT_AUDIT	If FORMAT_AUDIT is set, and WFORMAT is set and > 1, turn on
-WFORMAT 	-Wnetbsd-format-audit for extra-stringent format checking.
-		WFORMAT belongs in individual makefiles and/or
-		Makefile.inc files.  (set WFORMAT=1 in individual
-		makefiles if a program is not security critical and is
-		doing bizarre things with format strings which would
-		be even uglier if rewritten) FORMAT_AUDIT should go in
-		mk.conf if you're doing format-string auditing.
-		FORMAT_AUDIT may go away in time.
-
-
 =-=-=-=-=   bsd.x11.mk   =-=-=-=-=
 
 The include file <bsd.x11.mk> contains parameters and targets for
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 7090175e1265..32ac5ff1dfe6 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.135 2006/09/09 03:53:19 simonb Exp $
+#	$NetBSD: bsd.sys.mk,v 1.136 2006/10/08 17:16:51 elad Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -33,12 +33,6 @@ CFLAGS+=	-std=gnu99
 .endif
 .endif
 
-.if defined(WFORMAT) && defined(FORMAT_AUDIT)
-.if ${WFORMAT} > 1
-CFLAGS+=	-Wnetbsd-format-audit -Wno-format-extra-args
-.endif
-.endif
-
 CPPFLAGS+=	${AUDIT:D-D__AUDIT__}
 CFLAGS+=	${CWARNFLAGS} ${NOGCCERROR:D:U-Werror}
 LINTFLAGS+=	${DESTDIR:D-d ${DESTDIR}/usr/include}