diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
index f0666f796a..19d9f17a21 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.49 2000/06/13 18:05:36 jim Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.50 2000/06/16 19:52:36 jim Exp $
 -->
 
 <chapter id="cutting-edge">
@@ -579,7 +579,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
 	    <term>RELENG_4_0_0_RELEASE</term>
 
 	    <listitem>
-	      <para>FreeBSD 4.0.</term>
+	      <para>FreeBSD 4.0.</para>
 	    </listitem>
 	  </varlistentry>
 	  
@@ -848,11 +848,19 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
     <sect2>
       <title>Check <filename>/etc/make.conf</filename></title>
 
-      <para>Examine the file <filename>/etc/make.conf</filename>.  This
-	contains some default defines for <command/make/, which will be
-	used when you rebuild the source.  They are also used every time
-	you use <command/make/, so it is a good idea to make sure they are
-	set to something sensible for your system.</para>
+      <para>Examine the files
+	<filename>/etc/defaults/make.conf</filename> and
+	<filename>/etc/make.conf</filename>.  The first contains some
+	default defines &ndash; most of which are commented out.  To
+	make use of them when you rebuild your system from source, add
+	them to <filename>/etc/make.conf</filename>.  Keep in mind that
+	anything to add to <filename>/etc/make.conf</filename> is also
+	used every time you run <command>make</command>, so it is a good
+	idea to set them to something sensible for your system.  As a
+	typical user (not a FreeBSD developer), you will probably want
+	to add the <makevar>CFLAGS</makevar> and
+	<makevar>NOPROFILE</makevar> lines found in
+	<filename>/etc/defaults/make.conf</filename>.</para>
 
       <para>Everything is, by default, commented out.  Uncomment those
 	entries that look useful.  For a typical user (not a developer),
diff --git a/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml
index f0666f796a..19d9f17a21 100644
--- a/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.49 2000/06/13 18:05:36 jim Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.50 2000/06/16 19:52:36 jim Exp $
 -->
 
 <chapter id="cutting-edge">
@@ -579,7 +579,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
 	    <term>RELENG_4_0_0_RELEASE</term>
 
 	    <listitem>
-	      <para>FreeBSD 4.0.</term>
+	      <para>FreeBSD 4.0.</para>
 	    </listitem>
 	  </varlistentry>
 	  
@@ -848,11 +848,19 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
     <sect2>
       <title>Check <filename>/etc/make.conf</filename></title>
 
-      <para>Examine the file <filename>/etc/make.conf</filename>.  This
-	contains some default defines for <command/make/, which will be
-	used when you rebuild the source.  They are also used every time
-	you use <command/make/, so it is a good idea to make sure they are
-	set to something sensible for your system.</para>
+      <para>Examine the files
+	<filename>/etc/defaults/make.conf</filename> and
+	<filename>/etc/make.conf</filename>.  The first contains some
+	default defines &ndash; most of which are commented out.  To
+	make use of them when you rebuild your system from source, add
+	them to <filename>/etc/make.conf</filename>.  Keep in mind that
+	anything to add to <filename>/etc/make.conf</filename> is also
+	used every time you run <command>make</command>, so it is a good
+	idea to set them to something sensible for your system.  As a
+	typical user (not a FreeBSD developer), you will probably want
+	to add the <makevar>CFLAGS</makevar> and
+	<makevar>NOPROFILE</makevar> lines found in
+	<filename>/etc/defaults/make.conf</filename>.</para>
 
       <para>Everything is, by default, commented out.  Uncomment those
 	entries that look useful.  For a typical user (not a developer),