diff --git a/.gitignore b/.gitignore
index cb82082..f72258c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /.project
 /*.src.rpm
 
+/org.eclipse.license-57a2c5aac0e8cb3a0bfbb4468826e5c2a45d5029.tar.bz2
diff --git a/eclipse-license.spec b/eclipse-license.spec
index 7888f84..b1fd558 100644
--- a/eclipse-license.spec
+++ b/eclipse-license.spec
@@ -1,44 +1,88 @@
-%global license_ver 1.0.1
-%global qualifier v20140414-1359
-%global gittag org.eclipse.license-license-%{license_ver}.%{qualifier}
+# We need to ship both versions of the EPL
+# Some plug-ins are moving to EPL 2, but some plug-ins might stay with EPL 1
+%global eplv2_ver 2.0.1
+%global eplv2_tag org.eclipse.license-57a2c5aac0e8cb3a0bfbb4468826e5c2a45d5029
+%global eplv1_ver 1.0.1
+%global eplv1_tag org.eclipse.license-license-1.0.1.v20140414-1359
 
 Name:      eclipse-license
-Version:   %{license_ver}
-Release:   12%{?dist}
-Summary:   Shared license feature for Eclipse
-
-License:   EPL
+Version:   %{eplv2_ver}
+Release:   1%{?dist}
+Summary:   Shared license features for Eclipse
+License:   EPL-1.0 and EPL-2.0
 URL:       http://wiki.eclipse.org/CBI
-Source0:   http://git.eclipse.org/c/cbi/org.eclipse.license.git/snapshot/%{gittag}.tar.bz2
+Source1:   http://git.eclipse.org/c/cbi/org.eclipse.license.git/snapshot/%{eplv1_tag}.tar.bz2
+Source2:   http://git.eclipse.org/c/cbi/org.eclipse.license.git/snapshot/%{eplv2_tag}.tar.bz2
 
 BuildArch: noarch
 
 BuildRequires: tycho
 BuildRequires: tycho-extras
-BuildRequires: eclipse-filesystem
-
-Requires: eclipse-filesystem
 
 %description
+Shared license features for Eclipse. Other features may consume these
+features to avoid unnecessary duplication of license boiler plate.
+
+%package -n %{name}1
+Version:   %{eplv1_ver}
+Summary:   Shared EPL v1.0 license feature for Eclipse
+License:   EPL-1.0
+# Provides/Obsoletes added in F28
+Provides:  eclipse-license = %{eplv1_ver}-20
+Obsoletes: eclipse-license < %{eplv2_ver}-%{release}
+
+%description -n %{name}1
+Shared license feature for Eclipse. Other features may consume this
+feature to avoid unnecessary duplication of license boiler plate.
+
+%package -n %{name}2
+Version:   %{eplv2_ver}
+Summary:   Shared EPL v2.0 license feature for Eclipse
+License:   EPL-2.0
+
+%description -n %{name}2
 Shared license feature for Eclipse. Other features may consume this
 feature to avoid unnecessary duplication of license boiler plate.
 
 %prep
-%setup -q -n %{gittag}
+%setup -q -c -T
 
-# Don't package poms
-%mvn_package "::pom::" __noinstall
+tar xf %{SOURCE1}
+tar xf %{SOURCE2}
 
 %build
+pushd %{eplv1_tag}
 %mvn_build -j
+popd
+
+pushd %{eplv2_tag}
+sed -i -e 's/\(-SNAPSHOT\|\.qualifier\)/.v20180423-1114/' pom.xml */*.xml
+%mvn_build -j
+popd
 
 %install
+pushd %{eplv1_tag}
+%mvn_package "::pom::" __noinstall
+%mvn_package ":" 1
 %mvn_install
+popd
 
-%files -f .mfiles
-%doc org.eclipse.license/epl-v10.html
+pushd %{eplv2_tag}
+%mvn_package "::pom::" __noinstall
+%mvn_package ":" 2
+%mvn_install
+popd
+
+%files -n %{name}1 -f %{eplv1_tag}/.mfiles-1
+%license %{eplv1_tag}/org.eclipse.license/*.html
+
+%files -n %{name}2 -f %{eplv2_tag}/.mfiles-2
+%license %{eplv2_tag}/org.eclipse.license/*.html
 
 %changelog
+* Wed May 30 2018 Mat Booth <mat.booth@redhat.com> - 2.0.1-1
+- Ship both EPL v1.0 and EPL v2.0 features
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index e895860..170b5d2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-5f25feaaddce979d93cc3809812b3fcf  org.eclipse.license-license-1.0.1.v20140414-1359.tar.bz2
+SHA512 (org.eclipse.license-license-1.0.1.v20140414-1359.tar.bz2) = 5b749fa58cc1c0371b0da2aedcf25710f13a29b5d947043dbbe3bdbd937d97e60742c4318db43d81977a49d732b341d11cabf66a4b606ef799c4db49dceb47ce
+SHA512 (org.eclipse.license-57a2c5aac0e8cb3a0bfbb4468826e5c2a45d5029.tar.bz2) = 7d89e1525d8a8061be244abd5b65b80532377c0c7029ff826a96d500ef13b6cd0f3f70be6bb768d6fa462afa44b835a42d093bec8e1f20853c77ca8a4ec8c356