diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 109bbe5..f85f68e 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -100,7 +100,7 @@ packaging in Linux distributions
 
 %package -n javapackages-local
 Summary:        Non-essential macros and scripts for Java packaging support
-Requires:       javapackages-generators = %{version}-%{release}
+Requires:       javapackages-common = %{version}-%{release}
 # Java build systems don't have hard requirement on java-devel, so it should be there
 Requires:       java-17-openjdk-devel
 Requires:       xmvn-tools
@@ -117,6 +117,22 @@ Requires:       %{python_interpreter}
 %description -n javapackages-generators
 RPM dependency generators to support Java packaging.
 
+%package -n javapackages-common
+Summary:        Non-essential macros and scripts for Java packaging support
+Requires:       javapackages-generators = %{version}-%{release}
+
+%description -n javapackages-common
+This package provides non-essential, but commonly used macros and
+scripts to support Java packaging.
+
+%package -n javapackages-extra
+Summary:        Rarely-used macros and scripts for Java packaging support
+Requires:       javapackages-generators = %{version}-%{release}
+
+%description -n javapackages-extra
+This package provides rarely-used and obsolete macros and scripts to
+support Java packaging.
+
 %package -n maven-local-openjdk8
 Summary:        OpenJDK 8 toolchain for XMvn
 RemovePathPostfixes: -openjdk8
@@ -186,7 +202,11 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 
 %files -n javapackages-generators -f files-generators
 
-%files -n javapackages-local -f files-local
+%files -n javapackages-common -f files-local
+
+%files -n javapackages-extra
+
+%files -n javapackages-local
 
 %files -n maven-local