diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 8f8a3b5..2faaef9 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -66,6 +66,8 @@ The tool is capable of acting as:
 %package -n aqute-bndlib
 Summary:        BND library
 Group:          Development/Libraries/Java
+Requires:       mvn(biz.aQute.bnd:aQute.libg)
+Requires:       mvn(biz.aQute.bnd:biz.aQute.bnd.annotation)
 Requires:       mvn(jline:jline)
 Requires:       mvn(org.osgi:osgi.annotation)
 Requires:       mvn(org.osgi:osgi.cmpn)
@@ -107,11 +109,11 @@ sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd
 # libg
 pushd aQute.libg
 cp -p %{SOURCE3} pom.xml
-%pom_change_dep :::provided:: :::compile::
-%pom_add_dep org.osgi:osgi.cmpn
-%pom_add_dep org.slf4j:slf4j-api
+%pom_remove_dep :::provided::
 %pom_remove_dep -r org.osgi:org.osgi.util.function
 %pom_remove_dep -r org.osgi:org.osgi.util.promise
+%pom_add_dep org.osgi:osgi.cmpn
+%pom_add_dep org.slf4j:slf4j-api
 popd
 
 # bndlib.annotations
@@ -126,27 +128,16 @@ popd
 # bndlib
 pushd biz.aQute.bndlib
 cp -p %{SOURCE5} pom.xml
-%pom_change_dep :::provided:: :::compile::
-%pom_add_dep org.osgi:osgi.annotation
-%pom_add_dep org.osgi:osgi.core
+%pom_remove_dep :::provided::
 %pom_add_dep org.osgi:osgi.cmpn
-%pom_add_dep org.slf4j:slf4j-api
 %pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
 %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
-%pom_remove_dep -r org.osgi:org.osgi.namespace.contract
-%pom_remove_dep -r org.osgi:org.osgi.namespace.extender
-%pom_remove_dep -r org.osgi:org.osgi.namespace.implementation
-%pom_remove_dep -r org.osgi:org.osgi.namespace.service
-%pom_remove_dep -r org.osgi:org.osgi.service.log
-%pom_remove_dep -r org.osgi:org.osgi.service.repository
-%pom_remove_dep -r org.osgi:org.osgi.util.function
-%pom_remove_dep -r org.osgi:org.osgi.util.promise
 popd
 
 # bnd.exporters
 pushd biz.aQute.bnd.exporters
 cp -p %{SOURCE7} pom.xml
-%pom_change_dep :::provided:: :::compile::
+%pom_remove_dep :::provided::
 %pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version}
 %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
 popd
@@ -154,7 +145,7 @@ popd
 # bnd
 pushd biz.aQute.bnd
 cp -p %{SOURCE4} pom.xml
-%pom_change_dep :::provided:: :::compile::
+%pom_remove_dep :::provided::
 %pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version}
 %pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
 %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
@@ -164,8 +155,6 @@ cp -p %{SOURCE4} pom.xml
 %pom_add_dep org.osgi:osgi.cmpn
 %pom_add_dep org.slf4j:slf4j-api
 %pom_add_dep org.slf4j:slf4j-simple::runtime
-%pom_remove_dep -r org.osgi:org.osgi.service.log
-%pom_remove_dep -r org.osgi:org.osgi.service.repository
 popd
 
 # maven-plugins
@@ -182,7 +171,6 @@ pushd maven
 # Integration tests require Internet access
 %pom_remove_plugin -r :maven-invoker-plugin
 %pom_remove_plugin -r :maven-javadoc-plugin
-
 %pom_remove_plugin -r :flatten-maven-plugin
 popd
 
diff --git a/bnd-maven-plugin.spec b/bnd-maven-plugin.spec
index 291b68f..4b6301b 100644
--- a/bnd-maven-plugin.spec
+++ b/bnd-maven-plugin.spec
@@ -73,6 +73,7 @@ pushd maven
 %pom_remove_dep -r :biz.aQute.resolve
 %pom_remove_dep -r :biz.aQute.repository
 %pom_remove_dep -r :biz.aQute.bnd.embedded-repo
+
 # Unavailable reactor dependency - org.osgi.impl.bundle.repoindex.cli
 %pom_disable_module bnd-indexer-maven-plugin
 # Requires unbuilt parts of bnd