diff --git a/build-spring-integration/package-top-level.xml b/build-spring-integration/package-top-level.xml
index 5afd77a3e2..0d44ce37cb 100644
--- a/build-spring-integration/package-top-level.xml
+++ b/build-spring-integration/package-top-level.xml
@@ -32,8 +32,8 @@
 		</copy>
 
 		<zip destfile="${package.output.file}">
-			<zipfileset dir="${package.output.dir}" includes="samples/**" filemode="755" prefix="${natural.name}"/>
-			<zipfileset dir="${package.output.dir}" excludes="samples/**" prefix="${natural.name}"/>
+			<zipfileset dir="${package.dir}" includes="**/samples/**"/>
+			<zipfileset dir="${package.dir}" excludes="**/samples/**"/>
 		</zip>
 	</target>