diff --git a/releng/org.eclipse.remote.deploy/assembly.xml b/releng/org.eclipse.remote.deploy/assembly.xml
index a6cdb50..ab46f1b 100644
--- a/releng/org.eclipse.remote.deploy/assembly.xml
+++ b/releng/org.eclipse.remote.deploy/assembly.xml
@@ -4,7 +4,7 @@
 
 	<id>assemble</id>
 	<formats>
-		<format>zip</format>
+		<format>jar</format>
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
 
@@ -12,7 +12,7 @@
 		<dependencySet>
 			<useProjectArtifact>false</useProjectArtifact>
 			<useTransitiveDependencies>false</useTransitiveDependencies>
-			<unpack>false</unpack>
+			<unpack>true</unpack>
 		</dependencySet>
 	</dependencySets>
 
diff --git a/releng/org.eclipse.remote.deploy/pom.xml b/releng/org.eclipse.remote.deploy/pom.xml
index bb53ca0..ba83ff3 100644
--- a/releng/org.eclipse.remote.deploy/pom.xml
+++ b/releng/org.eclipse.remote.deploy/pom.xml
@@ -43,12 +43,13 @@
 				<version>3.1.1</version>
 				<executions>
 					<execution>
-						<id>copy-dependencies</id>
+						<id>dependencies</id>
 						<phase>package</phase>
 						<goals>
-							<goal>copy-dependencies</goal>
+							<goal>unpack-dependencies</goal>
 						</goals>
 						<configuration>
+							<useRepositoryLayout>true</useRepositoryLayout>
 						</configuration>
 					</execution>
 				</executions>