diff --git a/.javapackages-tools.metadata b/.javapackages-tools.metadata
new file mode 100644
index 0000000..e532d9e
--- /dev/null
+++ b/.javapackages-tools.metadata
@@ -0,0 +1 @@
+0c2f59a61e8e8eb664f679efab383deadaed2cc6 6.0.0.tar.gz
diff --git a/javapackages-config.json b/javapackages-config.json
index 28f6648..d78ebe1 100644
--- a/javapackages-config.json
+++ b/javapackages-config.json
@@ -2,7 +2,7 @@
     "maven.req": {
         "always_generate": [
             "javapackages-filesystem",
-            "(java-headless or java-11-headless)"
+            "(java-headless or java-17-headless or java-11-headless or java-1.8.0-headless)"
         ],
         "java_requires": {
             "skip": true
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 8a700b7..e6ae8f3 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -14,7 +14,7 @@
 
 Name:           javapackages-tools
 Version:        6.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -220,6 +220,10 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %license LICENSE
 
 %changelog
+* Wed Jan 25 2023 Marián Konček <mkoncek@redhat.com> - 6.0.0-4
+- Add generated Requires on multiple versions of java-headless
+- Related: rhbz#2164437
+
 * Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-3
 - Implement OpenJDK 11 and 17 toolchains