diff --git a/hamcrest-1.3-random-build-crash.patch b/hamcrest-1.3-random-build-crash.patch
new file mode 100644
index 0000000..0370ee9
--- /dev/null
+++ b/hamcrest-1.3-random-build-crash.patch
@@ -0,0 +1,42 @@
+diff -urN hamcrest-1.3.old/build.xml hamcrest-1.3/build.xml
+--- hamcrest-1.3.old/build.xml	2014-06-16 13:00:29.321699344 +0200
++++ hamcrest-1.3/build.xml	2014-06-16 14:24:30.160165471 +0200
+@@ -27,6 +27,7 @@
+     </target>
+ 
+     <target name="core" depends="generator" description="Build core Hamcrest library">
++        <parallel threadcount="1">
+         <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>
+ 
+         <!-- Generate one class with all static imports -->
+@@ -36,7 +37,7 @@
+               fork="yes"
+               failonerror="yes"
+               classpath="
+-                build/hamcrest-core-${version}.jar;
++                build/temp/hamcrest-core-${version}.jar.contents;
+                 build/hamcrest-generator-${version}.jar;
+               ">
+             <arg value="core-matchers.xml"/>
+@@ -48,11 +49,13 @@
+         <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
+                      modulename="hamcrest-core"
+                      classpath="build/hamcrest-core-${version}.jar"/>
++        </parallel>
+     </target>
+ 
+     <target name="library"
+             depends="core,generator"
+             description="Build library of matchers">
++	<parallel threadcount="1">
+         <mkdir dir="build/temp/hamcrest-library/generated-code"/>
+         <java-to-jar srcdir="hamcrest-library/src/main/java"
+                      modulename="hamcrest-library"
+@@ -75,6 +78,7 @@
+         <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
+                      modulename="hamcrest-library"
+                      classpath="build/hamcrest-core-${version}.jar"/>
++        </parallel>
+     </target>
+ 
+     <target name="integration" depends="core, library" description="Build integration with external tools">
diff --git a/hamcrest.changes b/hamcrest.changes
index 52000b0..acb24e6 100644
--- a/hamcrest.changes
+++ b/hamcrest.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 16 12:25:07 UTC 2014 - tchvatal@suse.com
+
+- Add patch to fix random build errors by enforcing single thread.
+  * hamcrest-1.3-random-build-crash.patch
+
 -------------------------------------------------------------------
 Tue Oct 29 12:51:11 UTC 2013 - mvyskocil@suse.com
 
diff --git a/hamcrest.spec b/hamcrest.spec
index c8ede24..e7a395b 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package hamcrest
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -67,6 +67,8 @@ Patch1:         %{name}-%{version}-no-jarjar.patch
 Patch2:         %{name}-%{version}-no-integration.patch
 #PATCH-FIX-OPENSUSE: there is no hamcrest-generator-nodeps
 Patch3:         %{name}-%{version}-javadoc.patch
+#PATCH-FIX-UPSTREAM: random build crash fix
+Patch4:         hamcrest-1.3-random-build-crash.patch
 
 Requires:       java >= 1.6.0
 Requires:       qdox
@@ -161,6 +163,7 @@ ln -sf $(build-classpath testng-jdk15) lib/integration/
 %patch2 -p1
 %endif
 %patch3 -p1
+%patch4 -p1
 
 perl -pi -e 's/\r$//g' LICENSE.txt