diff --git a/gambas-3.5.3-fix-llvm-config-check.patch b/gambas-3.5.3-fix-llvm-config-check.patch
new file mode 100644
index 0000000..ba28cfc
--- /dev/null
+++ b/gambas-3.5.3-fix-llvm-config-check.patch
@@ -0,0 +1,14 @@
+diff -up gambas3-3.5.3/gb.jit/configure.ac.fixcheck gambas3-3.5.3/gb.jit/configure.ac
+--- gambas3-3.5.3/gb.jit/configure.ac.fixcheck	2014-06-10 13:38:27.754800146 -0400
++++ gambas3-3.5.3/gb.jit/configure.ac	2014-06-10 13:38:57.446613682 -0400
+@@ -16,8 +16,8 @@ else
+   AC_MSG_CHECKING(for LLVM - version >= $min_llvm_version)
+ 
+   LLVM_VERSION=`$LLVM_CONFIG --version`
+-  llvm_major_version=`echo $LLVM_VERSION | sed 's/svn.*//g' | sed 's/\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-  llvm_minor_version=`echo $LLVM_VERSION | sed 's/svn.*//g' | sed 's/\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++  llvm_major_version=`echo $LLVM_VERSION | cut -d . -f 1-2 | sed 's/svn.*//g' | sed 's/\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++  llvm_minor_version=`echo $LLVM_VERSION | cut -d . -f 1-2 | sed 's/svn.*//g' | sed 's/\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+   min_llvm_major_version=`echo $min_llvm_version | sed 's/\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+   min_llvm_minor_version=`echo $min_llvm_version | sed 's/\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+   
diff --git a/gambas3.spec b/gambas3.spec
index 581dcf6..0df6f49 100644
--- a/gambas3.spec
+++ b/gambas3.spec
@@ -1,7 +1,7 @@
 Name:		gambas3
 Summary:	IDE based on a basic interpreter with object extensions
 Version:	3.5.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL+
 Group:		Development/Tools
 URL:		http://gambas.sourceforge.net/
@@ -36,6 +36,9 @@ Patch1:		%{name}-3.2.0-nolintl.patch
 Patch2:		%{name}-3.2.0-noliconv.patch
 # Don't conflict with siginfo_t define
 Patch5:		gambas3-3.1.1-linux-siginfo.patch
+# Fix llvm-config check (it breaks on cases where the version has a subrelease
+# e.g. 3.4.1 vs 3.4). This forces us to only pass the first two digits.
+Patch6:		gambas-3.5.3-fix-llvm-config-check.patch
 
 %description
 Gambas3 is a free development environment based on a Basic interpreter
@@ -798,6 +801,7 @@ Requires:	%{name}-gb-xml = %{version}-%{release}
 %patch1 -p1 -b .nolintl
 %patch2 -p1 -b .noliconv
 # %%patch5 -p1 -b .linux-siginfo
+%patch6 -p1 -b .fix-llvm-config-check
 # We used to patch these out, but this is simpler.
 for i in `find . |grep acinclude.m4`; do
 	sed -i 's|$AM_CFLAGS -O3|$AM_CFLAGS|g' $i
@@ -2439,6 +2443,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Tue Jun 10 2014 Tom Callaway <spot@fedoraproject.org> - 3.5.3-4
+- fix llvm-config check to deal with longer version strings
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild