diff --git a/lilypond-2.15.38-backintime.patch b/lilypond-2.15.38-backintime.patch
new file mode 100644
index 0000000..9bfc4b7
--- /dev/null
+++ b/lilypond-2.15.38-backintime.patch
@@ -0,0 +1,22 @@
+--- stepmake/aclocal.m4~	2012-05-03 11:53:07.000000000 -0500
++++ stepmake/aclocal.m4	2012-05-11 09:43:55.571617264 -0500
+@@ -287,12 +287,17 @@
+ ])
+ 
+ AC_DEFUN(STEPMAKE_GXXCODEGENBUG, [
+-    AC_MSG_CHECKING([options for known g++ tail call bug])
++    AC_MSG_CHECKING([options for known g++ bugs])
+     case "$GXX:$CXX_VERSION" in
+ 	yes:400600?)
+-	    AC_MSG_RESULT([-fno-optimize-sibling-calls])
++	    AC_MSG_RESULT([-fno-optimize-sibling-calls (tail call bug)])
+ 	    CXXFLAGS="$CXXFLAGS -fno-optimize-sibling-calls"
+ 	    ;;
++        yes:400700?)
++            AC_MSG_RESULT([-fno-tree-vrp (comparison bug)])
++            CXXFLAGS="$CXXFLAGS -fno-tree-vrp"
++            ;;
++	    
+ 	*) AC_MSG_RESULT([none])
+     esac
+     AC_SUBST(CXXFLAGS)
diff --git a/lilypond.spec b/lilypond.spec
index dea6f0e..854a621 100644
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -1,6 +1,6 @@
 Name:		lilypond
 Version:	2.15.38
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -10,6 +10,7 @@ Source0:	http://download.linuxaudio.org/lilypond/sources/v2.15/%{name}-%{version
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		lilypond-2.11.65-python26.patch
 Patch1:		lilypond-2.21.2-gcc44-relocate.patch
+Patch2:		lilypond-2.15.38-backintime.patch
 
 Requires:	ghostscript >= 8.15
 Obsoletes: 	lilypond-fonts <= 2.12.1-1
@@ -82,6 +83,7 @@ This contains the directory common to all lilypond fonts.
 
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 %build
 %configure --without-kpathsea --disable-checking \
@@ -147,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri May 11 2012 Jon Ciesla <limburgher@gmail.com> - 2.15.38-2
+- Patch for gcc bug, BZ 820998.
+
 * Thu May 04 2012 Jon Ciesla <limburgher@gmail.com> - 2.15.38-1
 - New stable release.