diff --git a/hamcrest-1.3-fork-javac.patch b/hamcrest-1.3-fork-javac.patch
new file mode 100644
index 0000000..9186591
--- /dev/null
+++ b/hamcrest-1.3-fork-javac.patch
@@ -0,0 +1,22 @@
+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(-)
+
+Index: hamcrest-1.3/build.xml
+===================================================================
+--- hamcrest-1.3.orig/build.xml
++++ hamcrest-1.3/build.xml
+@@ -268,7 +268,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"/>
diff --git a/hamcrest.changes b/hamcrest.changes
index 073d2a3..c66b0ae 100644
--- a/hamcrest.changes
+++ b/hamcrest.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 29 16:05:25 UTC 2017 - tchvatal@suse.com
+
+- Apply patch from fedora:
+  * hamcrest-1.3-fork-javac.patch
+
 -------------------------------------------------------------------
 Fri May 19 13:11:37 UTC 2017 - tchvatal@suse.com
 
diff --git a/hamcrest.spec b/hamcrest.spec
index 44709cf..2a334fa 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -48,6 +48,7 @@ Patch2:         %{name}-%{version}-no-integration.patch
 Patch3:         %{name}-%{version}-javadoc.patch
 #PATCH-FIX-UPSTREAM: random build crash fix
 Patch4:         hamcrest-1.3-random-build-crash.patch
+Patch5:         hamcrest-1.3-fork-javac.patch
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  javapackages-local
@@ -94,6 +95,7 @@ ln -sf $(build-classpath qdox) lib/generator/
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 perl -pi -e 's/\r$//g' LICENSE.txt