diff --git a/plexus-component-metadata.spec b/plexus-component-metadata.spec
index 569550d..bf30b8b 100644
--- a/plexus-component-metadata.spec
+++ b/plexus-component-metadata.spec
@@ -45,7 +45,6 @@ BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-xml)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
-BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
 BuildRequires:  mvn(org.jdom:jdom2)
 BuildRequires:  mvn(org.ow2.asm:asm) >= 7
 #!BuildRequires: maven-compiler-plugin-bootstrap
@@ -79,6 +78,8 @@ cp %{SOURCE2} .
 
 %pom_remove_plugin -r :maven-site-plugin
 
+%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
+
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
     <packaging>bundle</packaging>
diff --git a/plexus-containers.spec b/plexus-containers.spec
index 0aed2d6..13115eb 100644
--- a/plexus-containers.spec
+++ b/plexus-containers.spec
@@ -82,6 +82,8 @@ cp %{SOURCE2} .
 
 %pom_remove_plugin -r :maven-site-plugin
 
+%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
+
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
     <packaging>bundle</packaging>
diff --git a/plexus-metadata-generator.spec b/plexus-metadata-generator.spec
index e1bc77f..8c061a8 100644
--- a/plexus-metadata-generator.spec
+++ b/plexus-metadata-generator.spec
@@ -49,7 +49,6 @@ BuildRequires:  plexus-containers-component-annotations
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-xml
 BuildRequires:  qdox >= 2
-BuildRequires:  sisu-plexus
 BuildRequires:  xbean
 Requires:       apache-commons-cli
 Requires:       guava
@@ -85,7 +84,7 @@ Group:          Documentation/HTML
 %setup -q -n %{base_name}-%{base_name}-%{version} -a100
 
 mkdir -p lib
-build-jar-repository -s lib %{base_name} org.eclipse.sisu.plexus objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils plexus/xml jdom2/jdom2 commons-cli qdox plexus/cli
+build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils plexus/xml jdom2/jdom2 commons-cli qdox plexus/cli
 %if %{with tests}
 build-jar-repository -s lib hamcrest/core xbean/xbean-reflect
 %endif
@@ -97,10 +96,10 @@ build-jar-repository -s lib hamcrest/core xbean/xbean-reflect
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 
-rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
-
 %pom_remove_plugin -r :maven-site-plugin
 
+%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
+
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
     <packaging>bundle</packaging>
@@ -155,7 +154,7 @@ install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 # script
-%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:org.eclipse.sisu.plexus:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:plexus/xml:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
+%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:plexus/xml:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
 
 %files -f .mfiles
 %license LICENSE-2.0.txt LICENSE.MIT