diff --git a/tycho.spec b/tycho.spec
index 46699ab..78de647 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -12,7 +12,7 @@
 %bcond_with bootstrap
 
 # Allow conditionally building without Junit 5 support
-%bcond_with junit5
+%bcond_without junit5
 
 # Release tags or git SHAs
 %global git_tag tycho-%{version}
@@ -28,7 +28,7 @@
 
 Name:           tycho
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 # license file is missing but all files having some licensing information are ASL 2.0
@@ -180,6 +180,9 @@ no duplication of metadata between POM and OSGi metadata.
 
 %package javadoc
 Summary: Javadocs for %{name}
+# Extras was folded into the main tycho package in F31
+Obsoletes: tycho-extras-javadoc < 1.6.0-1
+Provides:  tycho-extras-javadoc = %{version}-%{release}
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -420,6 +423,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{xmvn_libdir}/inst
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Fri Mar 20 2020 Mat Booth <mat.booth@redhat.com> - 1.6.0-2
+- Add obsoletes/provides for extras javadoc package
+
 * Wed Feb 19 2020 Mat Booth <mat.booth@redhat.com> - 1.6.0-1
 - Update to latest upstream release