diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 206fb6f..73c6f63 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -4,10 +4,13 @@
 # Set this to avoid circular deps when bootstrapping
 %bcond_with bootstrap
 
+# Set this to avoid building epub support and bringing in long dep chain from tika
+%bcond_without mylyn_epub
+
 Name:    eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
 Version: 3.25.0
-Release: 0.8%{?dist}
+Release: 0.9%{?dist}
 License: EPL-1.0
 URL: http://www.eclipse.org/mylyn
 
@@ -57,7 +60,9 @@ BuildRequires: eclipse-pde
 %if %{without bootstrap}
 # Self dependencies
 BuildRequires: %{name}-docs-wikitext
+%if %{with mylyn_epub}
 BuildRequires: %{name}-docs-epub
+%endif
 # Circular dependencies
 BuildRequires: eclipse-cdt
 BuildRequires: eclipse-subclipse
@@ -74,8 +79,10 @@ BuildRequires: xmlrpc-common >= 3.1.3
 BuildRequires: xmlrpc-server >= 3.1.3
 BuildRequires: google-gson
 BuildRequires: guava20
+%if %{with mylyn_epub}
 BuildRequires: tika >= 1.17
 BuildRequires: tika-parsers >= 1.17
+%endif
 
 Requires:      eclipse-platform
 
@@ -127,13 +134,15 @@ License: EPL-2.0
 %description docs-wikitext
 Enables parsing and display of lightweight markup (wiki text) and HTML text.
 
+%if %{with mylyn_epub}
 %package docs-epub
 Summary: Mylyn EPub
 License: EPL-2.0
 
 %description docs-epub
 The EPUB framework in Mylyn Docs offers API to create, manipulate,
-read and write EPUB formatted files. 
+read and write EPUB formatted files.
+%endif
 
 %package tasks-trac
 Summary: Mylyn Tasks Connector: Trac
@@ -356,10 +365,12 @@ pushd org.eclipse.mylyn.docs/wikitext/core/
 %mvn_package ":" wikitext
 %mvn_build -f -j --post install:install -- -Dmaven.repo.local=$(pwd)/../../.m2
 popd
+%if %{with mylyn_epub}
 pushd org.eclipse.mylyn.docs/epub/core/
 %mvn_package ":" epub
 %mvn_build -f -j --post install:install -- -Dmaven.repo.local=$(pwd)/../../.m2
 popd
+%endif
 
 # Build everything else as a tycho project
 # Specifiying the local m2 repo to use the artifacts built previously
@@ -396,11 +407,9 @@ install %{SOURCE6} \
 
 %files docs-wikitext -f .mfiles-docs -f org.eclipse.mylyn.docs/wikitext/core/.mfiles-wikitext
 
-#%if %%{without bootstrap}
-#%files docs-epub -f .mfiles-docs-epub -f org.eclipse.mylyn.docs/epub/core/.mfiles-epub
-#%else
+%if %{with mylyn_epub}
 %files docs-epub -f org.eclipse.mylyn.docs/epub/core/.mfiles-epub
-#%endif
+%endif
 
 %files versions -f .mfiles-versions
 
@@ -419,6 +428,9 @@ install %{SOURCE6} \
 %files sdk -f .mfiles-sdk
 
 %changelog
+* Tue May 14 2019 Mat Booth <mat.booth@redhat.com> - 3.25.0-0.9
+- Add conditional build for epub support
+
 * Fri May 10 2019 Mat Booth <mat.booth@redhat.com> - 3.25.0-0.8
 - Don't build and ship tests