diff --git a/build/org.eclipse.pde.build/META-INF/MANIFEST.MF b/build/org.eclipse.pde.build/META-INF/MANIFEST.MF
index fbb277b4b4..a90bb23788 100644
--- a/build/org.eclipse.pde.build/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.pde.build/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.equinox.p2.jarprocessor;bundle-version="[1.3.200,2.0.0)",
  org.eclipse.equinox.p2.publisher;bundle-version="1.9.0",
  org.eclipse.equinox.p2.repository.tools;bundle-version="[2.4.200,3.0.0)";resolution:=optional,
- org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.5.200",
+ org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.6.300",
  org.eclipse.jdt.core;bundle-version="[3.36.0,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.22.0,4.0.0)"
 Import-Package: org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",
diff --git a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BundleHelper.java b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BundleHelper.java
index 504da5e80a..21469a23ac 100644
--- a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BundleHelper.java
+++ b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BundleHelper.java
@@ -215,7 +215,7 @@ public void setLog(Object antLog) {
 	}
 
 	public static String[] getClasspath(Dictionary<String, String> manifest) {
-		return org.eclipse.pde.internal.publishing.Utils.getBundleClasspath(manifest);
+		return org.eclipse.pde.internal.publishing.Utils.getBundleClasspath(manifest).toArray(String[]::new);
 	}
 
 	public static String getManifestHeader(Dictionary<String, String> manifest, String header) {
diff --git a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java
index 8d18fc50d3..40b748ad03 100644
--- a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java
+++ b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java
@@ -24,6 +24,7 @@
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -812,7 +813,7 @@ else if (obj instanceof OutputStream)
 	}
 
 	public static boolean guessUnpack(BundleDescription bundle, String[] classpath) {
-		return org.eclipse.pde.internal.publishing.Utils.guessUnpack(bundle, classpath);
+		return org.eclipse.pde.internal.publishing.Utils.guessUnpack(bundle, Arrays.asList(classpath));
 	}
 
 	public static Version extract3Segments(String s) {