diff --git a/0005-Port-to-latest-version-of-maven-archetypes.patch b/0005-Port-to-latest-version-of-maven-archetypes.patch
index dc9390e..b68c04f 100644
--- a/0005-Port-to-latest-version-of-maven-archetypes.patch
+++ b/0005-Port-to-latest-version-of-maven-archetypes.patch
@@ -24,7 +24,7 @@ index 96ec268..42de5a3 100644
  
    <properties>
 -    <archetype-common.version>2.4</archetype-common.version>
-+    <archetype-common.version>3.1.2</archetype-common.version>
++    <archetype-common.version>3.2.0</archetype-common.version>
    </properties>
  
    <dependencies>
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 2d5cb35..b897d30 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -2,7 +2,7 @@
 
 Name:           eclipse-m2e-core
 Version:        1.16.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Maven integration for Eclipse
 
 # Most of components are under EPL, but some of them are licensed under
@@ -39,43 +39,43 @@ ExcludeArch: s390 %{arm} %{ix86}
 # Maven build-requires for the main build.  After successfull build
 # they can be regenerated with the following command:
 #   xmvn-builddep <path-to-build-log>
-BuildRequires:  maven-local
 BuildRequires:  java-11-openjdk-devel
+BuildRequires:  maven-local
 BuildRequires:  mvn(io.takari.m2e.workspace:org.eclipse.m2e.workspace.cli)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-install-plugin)
 BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(org.eclipse.tycho.extras:tycho-p2-extras-plugin)
 BuildRequires:  mvn(org.eclipse.tycho:target-platform-configuration)
 BuildRequires:  mvn(org.eclipse.tycho:tycho-compiler-plugin)
 BuildRequires:  mvn(org.eclipse.tycho:tycho-maven-plugin)
 BuildRequires:  mvn(org.eclipse.tycho:tycho-p2-plugin)
 BuildRequires:  mvn(org.eclipse.tycho:tycho-packaging-plugin)
 BuildRequires:  mvn(org.eclipse.tycho:tycho-source-plugin)
-BuildRequires:  mvn(org.eclipse.tycho:tycho-surefire-plugin)
 BuildRequires:  mvn(org.sonatype.forge:forge-parent:pom:)
 
 # Additional Maven build-requires for m2e-maven-runtime.  They cannot
 # be regenerated using xmvn-builddep because m2e-maven-runtime is not
 # built using %%mvn_build.
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.maven.archetype:archetype-common) >= 3.1.1
+BuildRequires:  mvn(org.apache.maven.archetype:archetype-common) >= 3.2.0
 BuildRequires:  mvn(org.apache.maven.indexer:indexer-core) >= 6.0.0
 BuildRequires:  mvn(org.apache.maven:maven-compat)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-embedder)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-api)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-connector-basic)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-impl)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-spi)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-transport-wagon)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-util)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-file)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-http)
-BuildRequires:  mvn(org.eclipse.aether:aether-api)
-BuildRequires:  mvn(org.eclipse.aether:aether-connector-basic)
-BuildRequires:  mvn(org.eclipse.aether:aether-impl)
-BuildRequires:  mvn(org.eclipse.aether:aether-spi)
-BuildRequires:  mvn(org.eclipse.aether:aether-util)
-BuildRequires:  mvn(org.eclipse.aether:aether-transport-wagon)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
 BuildRequires:  mvn(org.eclipse.tycho:tycho-maven-plugin)
 BuildRequires:  mvn(org.eclipse.tycho:tycho-p2-plugin)
+BuildRequires:  mvn(org.fusesource.jansi:jansi)
 BuildRequires:  mvn(org.slf4j:slf4j-simple)
-BuildRequires:  mvn(org.sonatype.forge:forge-parent:pom:)
 BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
 
 # OSGi build-requires.  They can be regenerated with the following command:
@@ -164,7 +164,6 @@ Requires:       apache-commons-cli
 Requires:       apache-commons-codec
 Requires:       apache-commons-collections
 Requires:       apache-commons-io
-Requires:       apache-commons-lang
 Requires:       apache-commons-lang3
 Requires:       atinject
 Requires:       cdi-api
@@ -182,9 +181,9 @@ Requires:       lucene-memory
 Requires:       lucene-queries
 Requires:       lucene-queryparser
 Requires:       lucene-sandbox
-Requires:       maven-archetype-catalog >= 3.1.1
-Requires:       maven-archetype-common >= 3.1.1
-Requires:       maven-archetype-descriptor >= 3.1.1
+Requires:       maven-archetype-catalog >= 3.2.0
+Requires:       maven-archetype-common >= 3.2.0
+Requires:       maven-archetype-descriptor >= 3.2.0
 Requires:       maven-artifact-transfer
 Requires:       maven-common-artifact-filters
 Requires:       maven-indexer >= 6.0.0
@@ -323,7 +322,9 @@ export JAVA_HOME=%{_jvmdir}/java-11
 # Building m2e is a two step process.  See upstream documentation:
 # http://wiki.eclipse.org/M2E_Development_Environment#Building_m2e_on_command_line
 repo=localrepo
-xmvn -B -o package -f m2e-maven-runtime/pom.xml -Dmaven.repo.local=${repo}
+pushd m2e-maven-runtime
+xmvn -B -o package org.fedoraproject.xmvn:xmvn-mojo:builddep -Dmaven.repo.local=../${repo}
+popd
 # Manually install the first stage (don't rely on felix OBR)
 mkdir tmp && pushd tmp
 for aid in org.eclipse.m2e.archetype.common \
@@ -358,6 +359,10 @@ xmvn-subst -s $(find %{buildroot}%{_datadir}/eclipse/droplets/m2e-core -name jar
 %license LICENSE-2.0.txt
 
 %changelog
+* Sun Aug 16 2020 Mat Booth <mat.booth@redhat.com> - 1.16.1-2
+- Rebuild against maven-archetype/commons-lang3
+- Regenerate Rs/BRs
+
 * Fri Aug 14 2020 Mat Booth <mat.booth@redhat.com> - 1.16.1-1
 - Update to latest upstream release