diff --git a/javacc-maven-plugin.spec b/javacc-maven-plugin.spec
index 7ad358a..8c6ce79 100644
--- a/javacc-maven-plugin.spec
+++ b/javacc-maven-plugin.spec
@@ -1,6 +1,6 @@
 Name:           javacc-maven-plugin
 Version:        2.6
-Release:        33%{?dist}
+Release:        34%{?dist}
 Summary:        JavaCC Maven Plugin
 License:        ASL 2.0
 URL:            http://mojo.codehaus.org/javacc-maven-plugin/ 
@@ -16,16 +16,12 @@ Patch0:         javacc-maven-plugin-pom.patch
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(net.java.dev.javacc:javacc)
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
-BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.apache.maven:maven-project)
-BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
-BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
 BuildRequires:  mvn(org.codehaus.mojo:mojo-parent:pom:)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 
 %description
 Maven Plugin for processing JavaCC grammar files.
@@ -41,6 +37,16 @@ API documentation for %{name}.
 %patch0 -b .sav
 cp -p %{SOURCE1} .
 
+# Port to Maven 3
+%pom_change_dep :maven-project :maven-core
+
+# Remove documentation MOJO that relies on Maven 2 APIs
+find -name JJDocMojo.java -delete
+%pom_remove_dep :doxia-sink-api
+%pom_remove_dep :doxia-site-renderer
+%pom_remove_dep :maven-reporting-api
+%pom_remove_dep :maven-reporting-impl
+
 %build
 %mvn_build
 
@@ -54,6 +60,10 @@ cp -p %{SOURCE1} .
 %doc LICENSE-2.0.txt src/main/resources/NOTICE
 
 %changelog
+* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-34
+- Port to Maven 3
+- Resolves: rhbz#1976961
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.6-33
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937