diff --git a/.javapackages-tools.metadata b/.javapackages-tools.metadata
new file mode 100644
index 0000000..36b100b
--- /dev/null
+++ b/.javapackages-tools.metadata
@@ -0,0 +1 @@
+034466b051c016dd8f185858da82fc5ffe6c72f9 6.1.0.tar.gz
diff --git a/javapackages-config.json b/javapackages-config.json
index d06e353..d78ebe1 100644
--- a/javapackages-config.json
+++ b/javapackages-config.json
@@ -2,7 +2,7 @@
     "maven.req": {
         "always_generate": [
             "javapackages-filesystem",
-            "(java-headless or java-17-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 1925b34..3fd15d0 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -14,7 +14,7 @@
 
 Name:           javapackages-tools
 Version:        6.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -226,6 +226,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %license LICENSE
 
 %changelog
+* Thu Jan 26 2023 Marian Koncek <mkoncek@redhat.com> - 6.1.0-5
+- Add generated Requires on multiple versions of java-headless
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild