diff --git a/.maven.metadata b/.maven.metadata
new file mode 100644
index 0000000..df4252a
--- /dev/null
+++ b/.maven.metadata
@@ -0,0 +1 @@
+976a947711e82f11f47c7b128dd8df903642075b apache-maven-3.8.5-src.tar.gz
diff --git a/maven.spec b/maven.spec
index d72da3b..570cbc3 100644
--- a/maven.spec
+++ b/maven.spec
@@ -7,7 +7,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.8.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
@@ -116,7 +116,8 @@ Summary:        OpenJDK 8 binding for Maven
 RemovePathPostfixes: -openjdk8
 Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
 Requires: maven = %{epoch}:%{version}-%{release}
-Requires: java-1.8.0-openjdk-devel
+Requires: java-1.8.0-openjdk-headless
+Recommends: java-1.8.0-openjdk-devel
 Conflicts: maven-jdk-binding
 
 %description openjdk8
@@ -127,7 +128,8 @@ Summary:        OpenJDK 11 binding for Maven
 RemovePathPostfixes: -openjdk11
 Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
 Requires: maven = %{epoch}:%{version}-%{release}
-Requires: java-11-openjdk-devel
+Requires: java-11-openjdk-headless
+Recommends: java-11-openjdk-devel
 Conflicts: maven-jdk-binding
 
 %description openjdk11
@@ -138,7 +140,8 @@ 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
+Requires: java-17-openjdk-headless
+Recommends: java-17-openjdk-devel
 Conflicts: maven-jdk-binding
 
 %description openjdk17
@@ -250,9 +253,9 @@ ln -s %{homedir}/bin/mvnDebug.1.gz %{buildroot}%{_mandir}/man1/mvnDebug%{maven_v
 
 # JDK bindings
 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
+echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
+echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
+echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17
 
 
 %post
@@ -299,6 +302,10 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %config %{_javaconfdir}/maven.conf-openjdk17
 
 %changelog
+* Thu Feb 02 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.8.5-4
+- Turn hard dependency on java-devel into a weak dependencny
+- Resolves: rhbz#2165595
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.8.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild