Index: general.ent
===================================================================
--- general.ent	(revision f41cad7dfeb478965644d5c1df5d61695e472f20)
+++ general.ent	(revision 3e74bafefcee295dceb2844ccead03a73a93a186)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "16">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
@@ -43,4 +43,5 @@
 <!ENTITY lfs-shadow-version           "4.0.17">
 <!ENTITY lfs-vim-version              "7.0">
+<!ENTITY lfs-gcc-version              "4.1.2">
 <!-- End LFS versions -->
 
@@ -183,5 +184,5 @@
 <!ENTITY expect-version               "5.43.0">
 <!ENTITY gc-version                   "6.8">
-<!ENTITY gcc-version                  "4.0.3">
+<!ENTITY gcc-version                  "4.1.2">
 <!ENTITY gcc3-version                 "3.3.6">
 <!ENTITY guile-version                "1.6.7">
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision f41cad7dfeb478965644d5c1df5d61695e472f20)
+++ general/prog/gcc.xml	(revision 3e74bafefcee295dceb2844ccead03a73a93a186)
@@ -7,15 +7,12 @@
   <!ENTITY gcc-download-http  "http://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
   <!ENTITY gcc-download-ftp   "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-  <!ENTITY gcc-md5sum         "6ff1af12c53cbb3f79b27f2d6a9a3d50">
-  <!ENTITY gcc-size           "32.9 MB">
-  <!ENTITY gcc-buildsize      "1.7 GB">
-  <!ENTITY gcc-time           "60 SBU (build, test and install all compilers)">
-
-  <!ENTITY gnat-download-http "&sources-anduin-http;/g/gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.bz2">
-  <!ENTITY gnat-download-ftp  "&sources-anduin-ftp;/g/gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.bz2">
-  <!ENTITY gnat-md5sum        "c9aad2da908a40e876c24fc85f248b51">
-  <!ENTITY gnat-size          "11.6 MB">
-  <!ENTITY gnat-buildsize     "97.7 MB">
-  <!ENTITY gnat-time          "less than 0.1 SBU">
+  <!ENTITY gcc-md5sum         "a4a3eb15c96030906d8494959eeda23c">
+  <!ENTITY gcc-size           "39.7 MB">
+  <!ENTITY gcc-buildsize      "1.9 GB">
+  <!ENTITY gcc-time           "77 SBU (build, test and install all compilers)">
+
+  <!ENTITY gnat-download-http "https://libre.adacore.com/dynamic/download_page">
+  <!ENTITY gnat-md5sum        "659b7f57e00b73ecaa4863dabea5e0e2">
+  <!ENTITY gnat-size          "44.6 MB">
 ]>
 
@@ -105,8 +102,15 @@
       <application>GNAT</application> temporarily to satisfy the circular
       dependency when you recompile <application>GCC</application>
-      to include Ada.</para>
+      to include Ada. The download location shown below requires that you
+      create an account on the AdaCore site before you can download the
+      package. Nothing is required other than a valid email address.</para>
+
+      <para><emphasis role='strong'>Ensure you download the 2005 version of the
+      GNAT compiler. The 2006 version will not work. The file name you need is:
+      <filename>gnat-gpl-2005-i686-gnu-linux-gnu-libc2.3-bin.tar.gz</filename>.</emphasis>
+      </para>
     </note>
 
-    <bridgehead renderas="sect3">GNAT-3.15 Package Information</bridgehead>
+    <bridgehead renderas="sect3">GNAT GPL 2005 Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -114,7 +118,4 @@
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&gnat-download-ftp;"/></para>
-      </listitem>
-      <listitem>
         <para>Download MD5 sum: &gnat-md5sum;</para>
       </listitem>
@@ -122,18 +123,5 @@
         <para>Download size: &gnat-size;</para>
       </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnat-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnat-time;</para>
-      </listitem>
     </itemizedlist>
-
-    <!--
-    <bridgehead renderas="sect3">GNAT Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="tcsh"/></para>
-    -->
 
     <para condition="html" role="usernotes">User Notes:
@@ -150,22 +138,4 @@
 <screen role="root"><userinput>make ins-all prefix=/opt/gnat</userinput></screen>
 
-<!--
-<screen><userinput>./doconfig</userinput></screen>
-
-    <para>The above script will ask you how and where you would like to install
-    <application>GNAT</application>. To avoid conflicts with the system
-    <command>gcc</command>, the package will be installed in a separate
-    directory that can later be removed from the system.</para>
-
-    <para>In response to the questions asked by the <command>doconfig</command>
-    script, enter <userinput>3</userinput> in response to the first question
-    and <userinput>/opt/gnat</userinput> in response to the second
-    question.</para>
-
-    <para>To finish the installation, run the following command as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>./doinstall</userinput></screen>
--->
     <para>The <application>GNAT</application> compiler can be
     invoked by executing the <command>gcc</command> binary installed
@@ -176,5 +146,5 @@
 
 <screen><userinput>cd .. &amp;&amp;
-rm -rf gnat-3.15p-i686-pc-linux-gnu-bin</userinput></screen>
+rm -rf gnat-gpl-2005-i686-gnu-linux-gnu-libc2.3-bin</userinput></screen>
 
     <para>Prepare to compile <application>GCC</application> by placing the
@@ -207,21 +177,25 @@
       test results with those found at
       <ulink url="http://gcc.gnu.org/ml/gcc-testresults/"/>. There's also an
-      i686 platform test result produced by an LFS-SVN-20051127 system at
-      <ulink url="&files-anduin;/gcc403_test.txt"/>. You
+      i686 platform test result produced by an LFS-SVN-20070304 system at
+      <ulink url="&files-anduin;/gcc412_test.txt"/>. You
       may also want to refer to the information found in the
-      <application>GCC</application>-Pass 2 section of Chapter 5 in the LFS
-      book (<ulink url="&lfs-root;/chapter05/gcc-pass2.html"/>).</para>
+      <application>GCC</application> section of Chapter 6 in the LFS
+      book (<ulink url="&lfs-root;/chapter06/gcc.html"/>).</para>
     </important>
 
-    <!-- The instructions below perform a 'make bootstrap' instead of just
-         a plain 'make' intentionally. Even though we assume that the current
-         version of GCC is installed in LFS, because this installation includes
-         the Ada compiler as an installed language, a bootstrap is required.
-         The GNAT compiler must be used for stage1 of the bootstrap in order to
-         build Ada, therefore we must bootstrap, else we would have a GCC
-         installed on the system that was produced by a foriegn compiler. -->
+    <para>The instructions below perform a <quote><command>make
+    bootstrap</command></quote> instead of just a plain
+    <quote><command>make</command></quote> intentionally. Even though it is
+    assumed that the current version of <application>GCC</application> is
+    installed in LFS, because this installation includes the Ada compiler as an
+    installed language, a bootstrap is required. The GNAT compiler must be used
+    for stage1 of the bootstrap in order to build Ada. If the process didn't
+    use a <quote>bootstrap</quote> you could end up having a
+    <command>gcc</command> installed on the system that was produced by a
+    foriegn compiler.</para>
 
 <screen><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &amp;&amp;
 sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &amp;&amp;
+sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in &amp;&amp;
 mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
@@ -233,5 +207,5 @@
     --enable-__cxa_atexit \
     --enable-clocale=gnu \
-    --enable-languages=c,c++,objc,f95,ada,java,treelang &amp;&amp;
+    --enable-languages=c,c++,ada,fortran,java,objc,treelang &amp;&amp;
 make bootstrap &amp;&amp;
 make -k check &amp;&amp;
@@ -272,8 +246,7 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i 's/install_to_$(INSTALL_DEST) //'
-    libiberty/Makefile.in</command>: This command suppresses the installation
-    of <filename class='libraryfile'>libiberty.a</filename> as the version
-    provided by <application>Binutils</application> is used instead.</para>
+    <para>The three <command>sed</command> commands are the same ones used
+    during the build of LFS. A fourth one in LFS is ommitted intentionally,
+    due to the bootstrap build.</para>
 
     <para><command>mkdir ../gcc-build; cd ../gcc-build</command>: The
@@ -289,5 +262,5 @@
 
     <para>
-    <parameter>--enable-languages=c,c++,objc,f95,ada,java,treelang</parameter>:
+    <parameter>--enable-languages=c,c++,ada,fortran,java,objc,treelang</parameter>:
     This command identifies which languages to build. You may modify this command
     to remove undesired languages.</para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f41cad7dfeb478965644d5c1df5d61695e472f20)
+++ introduction/welcome/changelog.xml	(revision 3e74bafefcee295dceb2844ccead03a73a93a186)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>March 16th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to GCC-4.1.2, which matches the version
+          used in LFS.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 15th, 2007</para>
       <itemizedlist>
