diff --git a/SPECS/maven.spec b/SPECS/maven.spec
index f6e6e8f..9f36d83 100644
--- a/SPECS/maven.spec
+++ b/SPECS/maven.spec
@@ -5,7 +5,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.6.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
@@ -132,6 +132,17 @@ Conflicts: maven-jdk-binding
 %description -n %{?module_prefix}%{name}-openjdk11
 Configures Maven to run with OpenJDK 11.
 
+%package -n %{?module_prefix}%{name}-openjdk17
+Summary:        OpenJDK 17 binding for Maven
+RemovePathPostfixes: -openjdk17
+Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
+Requires: maven = %{epoch}:%{version}-%{release}
+Requires: java-17-openjdk-devel
+Conflicts: maven-jdk-binding
+
+%description -n %{?module_prefix}%{name}-openjdk17
+Configures Maven to run with OpenJDK 17.
+
 %{?javadoc_package}
 
 %prep
@@ -238,6 +249,7 @@ ln -s %{homedir}/bin/mvnDebug.1.gz %{buildroot}%{_mandir}/man1/mvnDebug%{maven_v
 install -d -m 755 %{buildroot}%{_javaconfdir}/
 echo JAVA_HOME=%{_jvmlibdir}/java-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
 echo JAVA_HOME=%{_jvmlibdir}/java-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
+echo JAVA_HOME=%{_jvmlibdir}/java-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17
 
 
 %post -n %{?module_prefix}%{name}
@@ -281,8 +293,15 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
 %files openjdk11
 %config %{_javaconfdir}/maven.conf-openjdk11
 
+%files openjdk17
+%config %{_javaconfdir}/maven.conf-openjdk17
+
 
 %changelog
+* Tue Nov 16 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-7
+- Add maven-openjdk17
+- Resolves: rhbz#1991521
+
 * Thu Dec 24 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-6
 - Move launcher scripts from maven-lib to maven package