diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 3194ab31f..f168f41d2 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
     <listitem>
       <para>2012-03-26</para>
       <itemizedlist>
+         <listitem>
+           <para>[matthew] - Upgrade to GCC-4.7.0. Fixes
+           <ulink url="&lfs-ticket-root;3044">#3044</ulink>. Thanks to Andy
+           Benton for the patch.</para>
+         </listitem>
          <listitem>
            <para>[matthew] - Upgrade to IPRoute2-3.3.0. Fixes
            <ulink url="&lfs-ticket-root;3043">#3043</ulink>.</para>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 98243d88b..e2f3cd09c 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -92,9 +92,9 @@ do
   sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&amp;@g' \
   -e 's@/usr@/tools@g' $file.orig &gt; $file
   echo '
-#undef STANDARD_INCLUDE_DIR
-#define STANDARD_INCLUDE_DIR 0
-#define STANDARD_STARTFILE_PREFIX_1 ""
+#undef STANDARD_STARTFILE_PREFIX_1
+#undef STANDARD_STARTFILE_PREFIX_2
+#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib"
 #define STANDARD_STARTFILE_PREFIX_2 ""' &gt;&gt; $file
   touch $file.orig
 done</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 7ce164baa..bf85a7653 100644
--- a/packages.ent
+++ b/packages.ent
@@ -169,10 +169,10 @@
 <!ENTITY gawk-ch6-du "28 MB">
 <!ENTITY gawk-ch6-sbu "0.2 SBU">
 
-<!ENTITY gcc-version "4.6.3">
-<!ENTITY gcc-size "70,312 KB">
+<!ENTITY gcc-version "4.7.0">
+<!ENTITY gcc-size "80,585 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "773092fe5194353b02bb0110052a972e">
+<!ENTITY gcc-md5 "2a0f1d99fda235c29d40b561f81d9a77">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "1.2 GB">
 <!ENTITY gcc-ch5p1-sbu "5.0 SBU">