diff --git a/hamcrest-1.3-fork-javac.patch b/hamcrest-1.3-fork-javac.patch
new file mode 100644
index 0000000..42ff689
--- /dev/null
+++ b/hamcrest-1.3-fork-javac.patch
@@ -0,0 +1,25 @@
+From 54b7ccdd1e16f1d6dd07359eae0fcac8f1883373 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+Date: Mon, 2 Jan 2017 10:31:56 +0100
+Subject: [PATCH] Fork javac
+
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index 1cfd4fb..69acfe8 100644
+--- a/build.xml
++++ b/build.xml
+@@ -284,7 +284,7 @@
+                 <attribute name="Built-Date" value="${build.timestamp}"/>
+             </manifest>
+             <mkdir dir="build/temp/@{modulename}-${version}.jar.contents"/>
+-            <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false">
++            <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false" fork="true">
+                 <classpath>
+                     <fileset dir="lib/integration">
+                         <include name="*.jar"/>
+-- 
+2.9.3
+
diff --git a/hamcrest.spec b/hamcrest.spec
index cbea5ff..ed19023 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -42,7 +42,7 @@
 
 Name:           hamcrest
 Version:        1.3
-Release:        15%{?dist}
+Release:        16%{?dist}
 Epoch:          0
 Summary:        Library of matchers for building test expressions
 License:        BSD
@@ -69,6 +69,7 @@ Patch0:         %{name}-%{version}-build.patch
 Patch1:         %{name}-%{version}-no-jarjar.patch
 Patch3:         %{name}-%{version}-javadoc.patch
 Patch4:         %{name}-%{version}-qdox-2.0.patch
+Patch5:         %{name}-%{version}-fork-javac.patch
 
 Requires:       java-headless >= 1:1.6.0
 Requires:       qdox
@@ -151,6 +152,7 @@ ln -sf $(build-classpath testng-jdk15) lib/integration/
 %endif
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 sed -i 's/
//' LICENSE.txt
 
@@ -250,6 +252,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
 %{_datadir}/%{name}
 
 %changelog
+* Mon Jan 02 2017 Michael Simacek <msimacek@redhat.com> - 0:1.3-16
+- Try to fix nondeterministic failures by forking javac
+
 * Mon Oct  3 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3-15
 - Remove build-requires on perl