diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 00c740b58..08759031f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,16 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2015-05-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add a patch from upstream to fix 
+          some libgomp (gcc) problems.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2015-05-14</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index d0fecb89d..281970562 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -244,6 +244,10 @@
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
+    <listitem>
+      <para>gcc-5.1.0-upstream_libgomp_fix-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>Tcl-core-&tcl-version;</para>
     </listitem>
@@ -294,10 +298,6 @@
       <para>bash-4.3-upstream_fixes-3.patch</para>
     </listitem>-->
 
-    <!--<listitem>
-      <para>gcc-4.9.1-upstream_fixes-1.patch</para>
-    </listitem>-->
-
     <!--<listitem>
       <para>readline-6.3-upstream_fixes-2.patch</para>
     </listitem>-->
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index d55746f46..ec3d6afa9 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -91,15 +91,14 @@
       </listitem>
     </varlistentry>
 -->
-<!--
     <varlistentry>
-      <term>Gcc Upstream Patch - <token>&gcc-upstream-patch-size;</token>:</term>
+      <term>Gcc Upstream Libgomp Patch - <token>&gcc-upstream-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&gcc-upstream-patch;"/></para>
         <para>MD5 sum: <literal>&gcc-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 7616b30ac..1ecf0a48a 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -41,6 +41,10 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
 
+    <para>First fix some problems with the libgomp library:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen>
+
     <para>The GCC documentation recommends building GCC outside of the source
     directory in a dedicated build directory:</para>
 
@@ -112,7 +116,7 @@ cd ../gcc-build</userinput></screen>
 
     <para>A few unexpected failures cannot always be avoided. The GCC developers
     are usually aware of these issues, but have not resolved them yet.
-    In particular, four tests in the libgomp test suite are known to fail.
+    In particular, one test in the libgomp test suite is known to fail.
     Unless the test results are vastly different from those at the above URL,
     it is safe to continue.</para>
 
diff --git a/general.ent b/general.ent
index f9008dd2a..fa7b94e7d 100644
--- a/general.ent
+++ b/general.ent
@@ -1,7 +1,7 @@
-<!ENTITY version         "SVN-20150514">
+<!ENTITY version         "SVN-20150515">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;. Change to x.y for release 
                                       but not -rc releases -->
-<!ENTITY releasedate     "May 14, 2015">
+<!ENTITY releasedate     "May 15, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.8">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index 405ebc879..8abe22374 100644
--- a/patches.ent
+++ b/patches.ent
@@ -18,6 +18,10 @@
 <!ENTITY coreutils-i18n-patch-md5 "587051bc411e0da9b3bf8984b49b364e">
 <!ENTITY coreutils-i18n-patch-size "138 KB">
 
+<!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_libgomp_fix-1.patch">
+<!ENTITY gcc-upstream-patch-md5 "4581511c217d70f8560d4a3907d51faa">
+<!ENTITY gcc-upstream-patch-size "8.3 KB">
+
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">