diff --git a/qt-x11-free-3.3.8b-gcc4-buildkey.patch b/qt-x11-free-3.3.8b-gcc4-buildkey.patch
deleted file mode 100644
index ed002bc..0000000
--- a/qt-x11-free-3.3.8b-gcc4-buildkey.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur qt-x11-free-3.3.8b/configure qt-x11-free-3.3.8b-gcc4-buildkey/configure
---- qt-x11-free-3.3.8b/configure	2008-01-15 20:09:15.000000000 +0100
-+++ qt-x11-free-3.3.8b-gcc4-buildkey/configure	2008-02-18 02:41:01.000000000 +0100
-@@ -3081,16 +3081,16 @@
- g++*)
-     # GNU C++
-     QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"`
--    COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null`
-+    COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null | sed 's,^[^0-9]*,,g'`
-     case "$COMPILER_VERSION" in
--    *2.95.*)
-+    2.95.*)
- 	COMPILER_VERSION="2.95.*"
- 	;;
--    *3.*)
-+    3.*)
- 	COMPILER_VERSION="3.*"
- 	;;
--    *4.*)
--	COMPILER_VERSION="4"
-+    4.*)
-+	COMPILER_VERSION="4.*"
- 	;;
-     *)
- 	;;
diff --git a/qt-x11-free-3.3.8b-gcc5-buildkey.patch b/qt-x11-free-3.3.8b-gcc5-buildkey.patch
new file mode 100644
index 0000000..855dc14
--- /dev/null
+++ b/qt-x11-free-3.3.8b-gcc5-buildkey.patch
@@ -0,0 +1,25 @@
+diff -ur qt-x11-free-3.3.8b/configure qt-x11-free-3.3.8b-gcc5-buildkey/configure
+--- qt-x11-free-3.3.8b/configure	2008-01-15 20:09:15.000000000 +0100
++++ qt-x11-free-3.3.8b-gcc5-buildkey/configure	2015-05-04 22:03:24.000000000 +0200
+@@ -3081,16 +3081,16 @@
+ g++*)
+     # GNU C++
+     QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"`
+-    COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null`
++    COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null`
+     case "$COMPILER_VERSION" in
+-    *2.95.*)
++    2.95.*)
+ 	COMPILER_VERSION="2.95.*"
+ 	;;
+-    *3.*)
++    3.*)
+ 	COMPILER_VERSION="3.*"
+ 	;;
+-    *4.*)
+-	COMPILER_VERSION="4"
++    5.*|4.*)
++	COMPILER_VERSION="4.*"
+ 	;;
+     *)
+ 	;;
diff --git a/qt3.spec b/qt3.spec
index 062b30f..b6266e0 100644
--- a/qt3.spec
+++ b/qt3.spec
@@ -6,7 +6,7 @@
 Name: qt3
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 63%{?dist}
+Release: 64%{?dist}
 License: QPL or GPLv2 or GPLv3
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +30,7 @@ Patch12: qt-uic-nostdlib.patch
 Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
 Patch14: qt-x11-free-3.3.3-gl.patch
 Patch19: qt-3.3.3-gtkstyle.patch 
-Patch20: qt-x11-free-3.3.8b-gcc4-buildkey.patch
+Patch20: qt-x11-free-3.3.8b-gcc5-buildkey.patch
 Patch24: qt-x11-free-3.3.5-uic.patch
 Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
 Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
@@ -290,7 +290,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.strip
 %patch13 -p1 -b .fonts
 %patch14 -p1 -b .gl
 %patch19 -p1 -b .gtk
-%patch20 -p1 -b .gcc4-buildkey
+%patch20 -p1 -b .gcc5-buildkey
 %patch24 -p1 -b .uic
 %patch25 -p1 -b .uic-multilib
 %patch27 -p1 -b .fontrendering-ml_IN-bz#209097
@@ -645,6 +645,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon May 04 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.3.8b-64
+- updated gcc5-buildkey patch for GCC 5 (supersedes gcc4-buildkey) (#1218091)
+
 * Tue Apr 21 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.3.8b-63
 - backport CVE-2015-1860 (GIF handler buffer overflow, #1210675) fix from Qt 4