diff --git a/jaxb-istack-commons.spec b/jaxb-istack-commons.spec
index f7c5527..30c2db1 100644
--- a/jaxb-istack-commons.spec
+++ b/jaxb-istack-commons.spec
@@ -1,6 +1,6 @@
 Name:           jaxb-istack-commons
 Version:        4.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        iStack Common Utility Code
 License:        BSD
 URL:            https://github.com/eclipse-ee4j/jaxb-istack-commons
@@ -10,73 +10,35 @@ ExclusiveArch:  %{java_arches} noarch
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(args4j:args4j)
 BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.ant:ant-junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-api)
-BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-impl)
-BuildRequires:  mvn(org.apache.maven:maven-artifact)
-BuildRequires:  mvn(org.apache.maven:maven-core)
-BuildRequires:  mvn(org.apache.maven:maven-model)
-BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires:  mvn(org.glassfish.jaxb:codemodel)
-BuildRequires:  mvn(org.testng:testng)
 
 %description
 Code shared between JAXP, JAXB, SAAJ, and JAX-WS projects.
 
-%package -n istack-commons-maven-plugin
-Summary:        istack-commons Maven Mojo
-
-%description -n istack-commons-maven-plugin
-This package contains the istack-commons Maven Mojo.
-
-%package -n import-properties-plugin
-Summary:        istack-commons import properties plugin
-
-%description -n import-properties-plugin
-This package contains the istack-commons import properties Maven Mojo.
-
-%package -n istack-commons-runtime
+%package runtime
 Summary:        istack-commons runtime
 
-%description -n istack-commons-runtime
+%description runtime
 This package contains istack-commons runtime.
 
-%package -n istack-commons-tools
-Summary:        istack-commons tools
-
-%description -n istack-commons-tools
-This package contains istack-commons tools.
-
-%package -n istack-commons-buildtools
-Summary:        istack-commons buildtools
-
-%description -n istack-commons-buildtools
-This package contains istack-commons buildtools.
-
-%package -n istack-commons-soimp
-Summary:        istack-commons soimp
-
-%description -n istack-commons-soimp
-This package contains istack-commons soimp.
-
-%package -n istack-commons-test
+%package test
 Summary:        istack-commons test
 
-%description -n istack-commons-test
+%description test
 This package contains istack-commons test.
 
+%package tools
+Summary:        istack-commons tools
+
+%description tools
+This package contains istack-commons tools.
+
 %prep
 %setup -q
 
@@ -91,10 +53,14 @@ pushd istack-commons
 %pom_remove_plugin :maven-source-plugin
 %pom_remove_plugin :spotbugs-maven-plugin
 
-%mvn_package :istack-commons __noinstall
+# Missing dependency on args4j
+%pom_disable_module soimp
 
-# Compatibility
-%mvn_alias :istack-commons-maven-plugin com.sun.istack:maven-istack-commons-plugin
+%pom_disable_module buildtools
+%pom_disable_module import-properties-plugin
+%pom_disable_module maven-plugin
+
+%mvn_package :istack-commons __noinstall
 popd
 
 %build
@@ -108,28 +74,17 @@ pushd istack-commons
 %mvn_install
 popd
 
-%files -n istack-commons-maven-plugin -f istack-commons/.mfiles-istack-commons-maven-plugin
+%files runtime -f istack-commons/.mfiles-istack-commons-runtime
 %license LICENSE.md NOTICE.md
-
-%files -n import-properties-plugin -f istack-commons/.mfiles-import-properties-plugin
+%files test -f istack-commons/.mfiles-istack-commons-test
 %license LICENSE.md NOTICE.md
-
-%files -n istack-commons-runtime -f istack-commons/.mfiles-istack-commons-runtime
-%license LICENSE.md NOTICE.md
-
-%files -n istack-commons-tools -f istack-commons/.mfiles-istack-commons-tools
-%license LICENSE.md NOTICE.md
-
-%files -n istack-commons-buildtools -f istack-commons/.mfiles-istack-commons-buildtools
-%license LICENSE.md NOTICE.md
-
-%files -n istack-commons-test -f istack-commons/.mfiles-istack-commons-test
-%license LICENSE.md NOTICE.md
-
-%files -n istack-commons-soimp -f istack-commons/.mfiles-istack-commons-soimp
+%files tools -f istack-commons/.mfiles-istack-commons-tools
 %license LICENSE.md NOTICE.md
 
 %changelog
+* Wed Feb 08 2023 Marian Koncek <mkoncek@redhat.com> - 4.1.1-3
+- Reorganize subpackages
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild