diff --git a/fop.spec b/fop.spec
index 810de7a..e5c5029 100644
--- a/fop.spec
+++ b/fop.spec
@@ -1,7 +1,7 @@
 Name:           fop
 Summary:        XSL-driven print formatter
 Version:        2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 # ASL 1.1:
 # several files in src/java/org/apache/fop/render/awt/viewer/resources/
 # rest is ASL 2.0
@@ -44,7 +44,6 @@ BuildRequires:  batik
 BuildRequires:  servlet
 BuildRequires:  qdox
 BuildRequires:  xmlunit
-BuildRequires:  zip
 BuildRequires:  junit
 BuildRequires:  fontbox
 
@@ -85,11 +84,8 @@ export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io \
 ant jar-main transcoder-pkg javadocs
 
 %install
-# inject OSGi manifests
-install -d -m 755 META-INF
-install -p -m 644 %{SOURCE2} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u build/%{name}.jar META-INF/MANIFEST.MF
+# inject OSGi manifest
+jar ufm build/%{name}.jar %{SOURCE2}
 
 # jars
 install -d -m 755 %{buildroot}%{_javadir}
@@ -125,6 +121,10 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 
 %changelog
+* Mon Sep 25 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-8
+- Elimitate race condition when injecting JAR manifest
+- Resolves: rhbz#1495235
+
 * Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-7
 - Add fontbox to classpath
 - Resolves: rhbz#1413340