diff --git a/.gitignore b/.gitignore
index 7ccc6b9..3763059 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,35 @@
+/aqute-service.tar.gz
+/bnd-0.0.363.jar
+/2.4.1.REL.tar.gz
+/biz.aQute.bnd-2.4.1.pom
+/biz.aQute.bndlib-2.4.1.pom
+/3.2.0.REL.tar.gz
+/aQute.libg-3.2.0.pom
+/biz.aQute.bnd-3.2.0.pom
+/biz.aQute.bndlib-3.2.0.pom
+/biz.aQute.bnd.annotation-3.2.0.pom
+/3.3.0.REL.tar.gz
+/aQute.libg-3.3.0.pom
+/biz.aQute.bnd-3.3.0.pom
+/biz.aQute.bndlib-3.3.0.pom
+/biz.aQute.bnd.annotation-3.3.0.pom
+/3.4.0.REL.tar.gz
+/aQute.libg-3.4.0.pom
+/biz.aQute.bnd-3.4.0.pom
+/biz.aQute.bndlib-3.4.0.pom
+/biz.aQute.bnd.annotation-3.4.0.pom
+/3.5.0.REL.tar.gz
+/aQute.libg-3.5.0.pom
+/biz.aQute.bnd-3.5.0.pom
+/biz.aQute.bndlib-3.5.0.pom
+/biz.aQute.bnd.annotation-3.5.0.pom
+/4.2.0.REL.tar.gz
+/aQute.libg-4.2.0.pom
+/biz.aQute.bnd-4.2.0.pom
+/biz.aQute.bndlib-4.2.0.pom
+/biz.aQute.bnd.annotation-4.2.0.pom
 /4.3.0.REL.tar.gz
+/aQute.libg-4.3.0.pom
+/biz.aQute.bnd-4.3.0.pom
+/biz.aQute.bndlib-4.3.0.pom
+/biz.aQute.bnd.annotation-4.3.0.pom
diff --git a/aQute.libg-4.3.0.pom b/aQute.libg-4.3.0.pom
deleted file mode 100644
index 37ad2d3..0000000
--- a/aQute.libg-4.3.0.pom
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>biz.aQute.bnd</groupId>
-  <artifactId>aQute.libg</artifactId>
-  <version>4.3.0</version>
-  <description>A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only.</description>
-  <name>aQute.libg</name>
-  <url>https://bnd.bndtools.org/</url>
-  <organization>
-    <name>Bndtools</name>
-    <url>https://bndtools.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache-2.0</name>
-      <url>https://opensource.org/licenses/Apache-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Apache License, Version 2.0</comments>
-    </license>
-    <license>
-      <name>EPL-2.0</name>
-      <url>https://opensource.org/licenses/EPL-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Eclipse Public License, Version 2.0</comments>
-    </license>
-  </licenses>
-  <scm>
-    <url>https://github.com/bndtools/bnd</url>
-    <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
-    <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>4.3.0.REL</tag>
-  </scm>
-  <developers>
-    <developer>
-      <id>pkriens</id>
-      <email>Peter.Kriens@aQute.biz</email>
-      <name>Peter Kriens</name>
-      <organization>Bndtools</organization>
-      <organizationUrl>https://github.com/bndtools</organizationUrl>
-      <roles>
-        <role>architect</role>
-        <role>developer</role>
-      </roles>
-      <timezone>1</timezone>
-    </developer>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.annotation</artifactId>
-      <version>7.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.util.function</artifactId>
-      <version>1.1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.util.promise</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/biz.aQute.bnd-4.3.0.pom b/biz.aQute.bnd-4.3.0.pom
deleted file mode 100644
index 94eb74e..0000000
--- a/biz.aQute.bnd-4.3.0.pom
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>biz.aQute.bnd</groupId>
-  <artifactId>biz.aQute.bnd</artifactId>
-  <version>4.3.0</version>
-  <description>This command line utility is the Swiss army knife of OSGi. It provides you with a breadth of tools to understand and manage OSGi based systems. This project basically uses bndlib.</description>
-  <name>biz.aQute.bnd</name>
-  <url>https://bnd.bndtools.org/</url>
-  <organization>
-    <name>Bndtools</name>
-    <url>https://bndtools.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache-2.0</name>
-      <url>https://opensource.org/licenses/Apache-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Apache License, Version 2.0</comments>
-    </license>
-    <license>
-      <name>EPL-2.0</name>
-      <url>https://opensource.org/licenses/EPL-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Eclipse Public License, Version 2.0</comments>
-    </license>
-  </licenses>
-  <scm>
-    <url>https://github.com/bndtools/bnd</url>
-    <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
-    <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>4.3.0.REL</tag>
-  </scm>
-  <developers>
-    <developer>
-      <id>pkriens</id>
-      <email>Peter.Kriens@aQute.biz</email>
-      <name>Peter Kriens</name>
-      <organization>Bndtools</organization>
-      <organizationUrl>https://github.com/bndtools</organizationUrl>
-      <roles>
-        <role>architect</role>
-        <role>developer</role>
-      </roles>
-      <timezone>1</timezone>
-    </developer>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.bndlib</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.resolve</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.repository</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.bnd.exporters</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.bnd.reporter</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.remote.api</artifactId>
-      <version>4.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>1.15</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.7.25</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>jline</groupId>
-      <artifactId>jline</artifactId>
-      <version>2.14.6</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/biz.aQute.bnd.annotation-4.3.0.pom b/biz.aQute.bnd.annotation-4.3.0.pom
deleted file mode 100644
index 528e18b..0000000
--- a/biz.aQute.bnd.annotation-4.3.0.pom
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>biz.aQute.bnd</groupId>
-  <artifactId>biz.aQute.bnd.annotation</artifactId>
-  <version>4.3.0</version>
-  <description>bnd Annotations Library</description>
-  <name>biz.aQute.bnd.annotation</name>
-  <url>https://bnd.bndtools.org/</url>
-  <organization>
-    <name>Bndtools</name>
-    <url>https://bndtools.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache-2.0</name>
-      <url>https://opensource.org/licenses/Apache-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Apache License, Version 2.0</comments>
-    </license>
-    <license>
-      <name>EPL-2.0</name>
-      <url>https://opensource.org/licenses/EPL-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Eclipse Public License, Version 2.0</comments>
-    </license>
-  </licenses>
-  <scm>
-    <url>https://github.com/bndtools/bnd</url>
-    <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
-    <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>4.3.0.REL</tag>
-  </scm>
-  <developers>
-    <developer>
-      <id>pkriens</id>
-      <email>Peter.Kriens@aQute.biz</email>
-      <name>Peter Kriens</name>
-      <organization>Bndtools</organization>
-      <organizationUrl>https://github.com/bndtools</organizationUrl>
-      <roles>
-        <role>architect</role>
-        <role>developer</role>
-      </roles>
-      <timezone>1</timezone>
-    </developer>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.annotation</artifactId>
-      <version>7.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/biz.aQute.bndlib-4.3.0.pom b/biz.aQute.bndlib-4.3.0.pom
deleted file mode 100644
index 8073eb5..0000000
--- a/biz.aQute.bndlib-4.3.0.pom
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>biz.aQute.bnd</groupId>
-  <artifactId>biz.aQute.bndlib</artifactId>
-  <version>4.3.0</version>
-  <description>bndlib: A Swiss Army Knife for OSGi</description>
-  <name>biz.aQute.bndlib</name>
-  <url>https://bnd.bndtools.org/</url>
-  <organization>
-    <name>Bndtools</name>
-    <url>https://bndtools.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache-2.0</name>
-      <url>https://opensource.org/licenses/Apache-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Apache License, Version 2.0</comments>
-    </license>
-    <license>
-      <name>EPL-2.0</name>
-      <url>https://opensource.org/licenses/EPL-2.0</url>
-      <distribution>repo</distribution>
-      <comments>Eclipse Public License, Version 2.0</comments>
-    </license>
-  </licenses>
-  <scm>
-    <url>https://github.com/bndtools/bnd</url>
-    <connection>scm:git:https://github.com/bndtools/bnd.git</connection>
-    <developerConnection>scm:git:git@github.com:bndtools/bnd.git</developerConnection>
-    <tag>4.3.0.REL</tag>
-  </scm>
-  <developers>
-    <developer>
-      <id>peter.kriens@aQute.biz</id>
-      <email>peter.kriens@aQute.biz</email>
-    </developer>
-    <developer>
-      <id>njbartlett@gmail.com</id>
-      <email>njbartlett@gmail.com</email>
-    </developer>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.annotation</artifactId>
-      <version>7.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.util.function</artifactId>
-      <version>1.1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.util.promise</artifactId>
-      <version>1.1.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/repack-tarball.sh b/repack-tarball.sh
old mode 100755
new mode 100644
diff --git a/sources b/sources
index d87620c..ebf3d61 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
 SHA512 (4.3.0.REL.tar.gz) = 0bae90a388fb52b9af88457b2a9b78530958be72567d66a0369c534df1aad7f2e7dae13e97a7153f847283b8fc31b1f76ef00c88944076a35e64b9e596925fec
+SHA512 (aQute.libg-4.3.0.pom) = a60d7d41a3eae51827e30a683b078087dde2d7f1dca79a4acccee1e25df84f7498a3be01eea69bc06eba355f3df490452dd8edbac469c294b34327dd46802c9e
+SHA512 (biz.aQute.bnd-4.3.0.pom) = e9b4f64359965c1b7799e545212f269fa5ced54d28160079e111529609b22e45eb9f0f0853e7270734cb2d468cbd4127601dcfe523d53ec2ba7c6af8f50f5346
+SHA512 (biz.aQute.bndlib-4.3.0.pom) = d74384a5d3f590d10a29b47734365eae1cdcf566bbab5a193db9b31fd64133091a2fe836e035f2add6c21b12a537bd3618c03d3b3e5412ccf8ff7765097a2df7
+SHA512 (biz.aQute.bnd.annotation-4.3.0.pom) = ef578cea5b1773e307f168ef27d91344f6f7d7ac874ff841e1831ff12ec741a568777931a29528a55812afed737af893740b8d812de4c72d8d9e07c027b56cd6