diff --git a/.gitignore b/.gitignore
index ed185c9..13323b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/spec-version-maven-plugin-1.2-src-svn.tar.gz
-/spec-version-maven-plugin-1.5.tar.gz
+/spec-version-maven-plugin-*.tar.gz
diff --git a/sources b/sources
index aaec8f2..db72745 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (spec-version-maven-plugin-1.5.tar.gz) = 8e16416fbd9a614591e873db4bcec5620ffb0c7aea73b667973c6848e34c669b6b1a8d22cc8ccbc865d7c83c9648828508943d94fc6d34db768cbe3cd4593800
+SHA512 (spec-version-maven-plugin-2.1.tar.gz) = c89b18a01a435f068c366ee0fbf9e1249b8ef12481386dfb2a623a3d2f4e0a0477913eb2e09a1ac3f94b9ed907aed74c7e6ac3d255546101e0665c2b31d56b20
diff --git a/spec-version-maven-plugin.spec b/spec-version-maven-plugin.spec
index d3fb256..fe3ebc9 100644
--- a/spec-version-maven-plugin.spec
+++ b/spec-version-maven-plugin.spec
@@ -1,19 +1,18 @@
 Name:           spec-version-maven-plugin
-Version:        1.5
-Release:        6%{?dist}
+Version:        2.1
+Release:        1%{?dist}
 Summary:        Spec Version Maven Plugin
-License:        CDDL or GPLv2 with exceptions
+License:        EPL-2.0 or GPLv2 with exceptions
 
-# project moved to eclipse-ee4j for versions > 1.5
-# https://github.com/eclipse-ee4j/glassfish-spec-version-maven-plugin
-URL:            https://github.com/javaee/spec-version-maven-plugin
-Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+URL:            https://projects.eclipse.org/projects/ee4j.glassfish
+Source0:        https://github.com/eclipse-ee4j/glassfish-%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
@@ -21,21 +20,16 @@ BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 %description
 Maven Plugin to configure APIs version and specs in a MANIFEST.MF file.
 
-
-%package javadoc
-Summary:        Javadoc for %{name}
-
-%description javadoc
-This package contains javadoc for %{name}.
-
+%javadoc_package
 
 %prep
-%autosetup
+%autosetup -n glassfish-%{name}-%{version}
 
 sed -i "s|mvn|mvn-rpmbuild|" src/main/resources/checkVersion.sh
 
-# Build for JDK 1.8 instead of 1.6
-sed -i 's/1\.6/1.8/g' pom.xml
+# remove spurious executable bits
+find -O3 . -type f -perm /0111 -exec chmod a-x {} +
+chmod a+x src/main/resources/checkVersion.sh
 
 # remove unnecessary dependency on parent POM
 %pom_remove_parent
@@ -44,26 +38,22 @@ sed -i 's/1\.6/1.8/g' pom.xml
 %pom_remove_plugin :glassfish-copyright-maven-plugin
 %pom_remove_plugin :maven-checkstyle-plugin
 
-%mvn_file :%{name} %{name}
-
-
 %build
 %mvn_build
 
-
 %install
 %mvn_install
 
-
 %files -f .mfiles
-%license LICENSE
+%license LICENSE.md NOTICE.md
 %doc README.md
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE
-
-
 %changelog
+* Tue Jun  7 2022 Jerry James <loganjerry@gmail.com> - 2.1-1
+- Version 2.1
+- New URLs
+- License change to EPL-2.0 or GPLv2 with exceptions
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.5-6
 - Rebuilt for java-17-openjdk as system jdk