diff --git a/SOURCES/javapackages-config.json b/SOURCES/javapackages-config.json
new file mode 100644
index 0000000..c3c4fdc
--- /dev/null
+++ b/SOURCES/javapackages-config.json
@@ -0,0 +1,20 @@
+{
+    "maven.req": {
+        "always_generate": [
+            "javapackages-filesystem",
+            "(java-headless or java-17-headless or java-11-headless or java-1.8.0-headless)"
+        ],
+        "java_requires": {
+            "skip": true
+        },
+        "java_devel_requires": {
+            "skip": true
+        }
+    },
+    "javadoc.req": {
+        "always_generate": [
+            "javapackages-filesystem"
+        ]
+    }
+}
+
diff --git a/SPECS/javapackages-tools.spec b/SPECS/javapackages-tools.spec
index bb563f4..f0afaa6 100644
--- a/SPECS/javapackages-tools.spec
+++ b/SPECS/javapackages-tools.spec
@@ -24,7 +24,7 @@
 
 Name:           javapackages-tools
 Version:        5.3.1
-Release:        7%{?dist}
+Release:        7%{?dist}.inferit
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -33,6 +33,7 @@ BuildArch:      noarch
 Source0:        https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
 Source1:        module-config.xml
 Source2:        toolchains-openjdk8.xml
+Source3:        javapackages-config.json
 
 Patch1:         0001-Move-python-modules-under-java-utils-directory.patch
 Patch2:         0002-Enable-namespaced-dependency-generation.patch
@@ -174,6 +175,8 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
 mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
 cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
 
+install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
+
 %check
 ./check
 
@@ -196,6 +199,10 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
 %{_datadir}/xmvn/conf
 
 %changelog
+* Wed May 22 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 5.3.1-7.inferit
+- Add generated Requires on multiple versions of java-headless
+- Related: rhbz#2164437
+
 * Tue May 07 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 5.3.1-7
 - Rebuilt for MSVSphere 8.9