diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 128a04a..385a4df 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -72,9 +72,11 @@
 #MAKE_SHELL?=sh
 #
 # BDECFLAGS are a set of gcc warning settings that Bruce Evans has suggested
-# for use in developing FreeBSD and testing changes.  They can be used by
-# putting "CFLAGS+=${BDECFLAGS}" in /etc/make.conf.  -Wconversion is not
-# included here due to compiler bugs, e.g., mkdir()'s mode_t argument.
+# for use in developing FreeBSD and testing changes.  They should *not* be used
+# in a production envirement.
+# They can be used by adding the definition shown below to /etc/make.conf.  To
+# enable BDECFLAGS put "CFLAGS+=${BDECFLAGS}" in /etc/make.conf.  -Wconversion
+# is not included here due to compiler bugs, e.g., mkdir()'s mode_t argument.
 #
 #BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 #		-Wcast-qual -Wchar-subscripts -Winline \
@@ -269,14 +271,14 @@
 # /etc/mail/Makefile.  Defaults to 0640.
 #
 #SENDMAIL_MAP_PERMS=
-#
-#
-# It is also possible to set variables in make.conf which will only be
-# used when compiling a specific port.  For more details see make(1).
-#
-#.if ${.CURDIR:M*/irc/irssi-devel*}
-#WITH_DEBUG=YES
-#.endif
-#
-# Another approach is to use /usr/ports/ports-mgmt/portconf which has
-# its own config file for port specific options.
+#
+#
+# It is also possible to set variables in make.conf which will only be
+# used when compiling a specific port.  For more details see make(1).
+#
+#.if ${.CURDIR:M*/irc/irssi-devel*}
+#WITH_DEBUG=YES
+#.endif
+#
+# Another approach is to use /usr/ports/ports-mgmt/portconf which has
+# its own config file for port specific options.
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 9cc3c1d..e9856d5 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 15, 2009
+.Dd September 7, 2010
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -141,17 +141,6 @@ Optimization levels other than
 and
 .Fl O2
 are not supported.
-.Va BDECFLAGS
-is provided as a set of
-.Xr gcc 1
-settings suggested by
-.An "Bruce Evans" Aq bde@FreeBSD.org
-for developing and testing changes.
-They can be used, if set, by:
-.Pp
-.Bd -literal -offset indent
-CFLAGS+=${BDECFLAGS}
-.Ed
 .It Va CPUTYPE
 .Pq Vt str
 Controls which processor should be targeted for generated
@@ -307,7 +296,7 @@ The flag for the
 command when doing
 .Dq Li "make update" .
 This defaults to
-.Op Fl g L Ar 2 .
+.Fl g L Ar 2 .
 .It Va SUPHOST
 .Pq Vt str
 The hostname of the sup server to use when doing
@@ -344,7 +333,7 @@ set to 0.
 Controls the compiler settings when building the
 kernel.
 Optimization levels above
-.Oo Fl O ( O2 , No ...\& ) Oc
+.Fl O ( O2 , No ...\& )
 are not guaranteed to work.
 .It Va KERNCONF
 .Pq Vt str
@@ -479,7 +468,7 @@ rather than load the server's kernel.
 .Pq Vt bool
 Defining this and recompiling
 .Pa /usr/src/sys/boot/i386
-will add 
+will add
 .Xr dcons 4
 console driver to
 .Xr loader 8
@@ -619,7 +608,7 @@ The default value is 0640.
 .Pq Vt str
 Additional maps to rebuild when using
 .Pa /etc/mail/Makefile .
-The 
+The
 .Pa access ,
 .Pa bitdomain ,
 .Pa domaintable ,