diff --git a/build-spring-integration/build.xml b/build-spring-integration/build.xml
index a5abf6b850..1854cbf5e5 100644
--- a/build-spring-integration/build.xml
+++ b/build-spring-integration/build.xml
@@ -8,31 +8,10 @@
 	</path>
 
 	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/package-top-level.xml"/>
 	<import file="../spring-build/multi-bundle/default.xml"/>
 
 
 	<target name="precommit" depends="clean,clean-integration,jar,test"/>
 
-	<target name="package.pre">
-		<delete quiet="true" dir="${package.output.dir}"/>
-		<mkdir dir="${package.output.dir}"/>
-	</target>
-
-	<target name="package.post" depends="resources, reference">
-		<mkdir dir="${target.dir}"/>
-		<zip destfile="${package.output.file}" basedir="${package.dir}"/>
-	</target>
-
-	<target name="resources">
-		<copy todir="${package.output.dir}">
-			<fileset dir="${basedir}/resources"/>
-		</copy>
-	</target>
-
-	<target name="reference">
-		<ant dir="${basedir}/../spring-integration-reference" target="reference" inheritAll="false">
-			<property name="target.dir" value="${package.output.dir}/docs"/>
-		</ant>
-	</target>
-
 </project>
\ No newline at end of file
diff --git a/build-spring-integration/package-bundle.xml b/build-spring-integration/package-bundle.xml
new file mode 100644
index 0000000000..333d067cc2
--- /dev/null
+++ b/build-spring-integration/package-bundle.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="package-bundle">
+
+	<target name="package" depends="ivy.init">
+		<dist-jar/>
+		<src-jar/>
+		<ext-jars/>
+	</target>
+
+</project>
diff --git a/build-spring-integration/package-top-level.xml b/build-spring-integration/package-top-level.xml
new file mode 100644
index 0000000000..5507e97936
--- /dev/null
+++ b/build-spring-integration/package-top-level.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="package-top-level">
+
+	<target name="package">
+		<delete dir="${package.output.dir}" quiet="true"/>
+		<mkdir dir="${package.output.dir}"/>
+		<delete file="${package.output.file}" quiet="true"/>
+		<mkdir dir="${artifacts.dir}"/>
+
+		<all-bundles target="package">
+			<property name="package.output.dir" value="${package.output.dir}"/>
+		</all-bundles>
+
+		<subant target="package" verbose="true" buildpath="../spring-integration-reference">
+			<property name="package.output.dir" value="${package.output.dir}"/>
+			<propertyset>
+				<propertyref builtin="commandline"/>
+			</propertyset>
+			<property name="timestamp" value="${timestamp}"/>
+		</subant>
+
+		<copy todir="${package.output.dir}">
+			<fileset dir="${basedir}/resources"/>
+		</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}"/>
+		</zip>
+	</target>
+
+</project>
diff --git a/spring-integration-adapters/build.xml b/spring-integration-adapters/build.xml
index 0c1c3f65b2..a7eb5669f5 100644
--- a/spring-integration-adapters/build.xml
+++ b/spring-integration-adapters/build.xml
@@ -2,6 +2,7 @@
 <project name="spring-integration-adapters">
 
 	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/../build-spring-integration/package-bundle.xml"/>
 	<import file="../spring-build/standard/default.xml"/>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-integration-core/build.xml b/spring-integration-core/build.xml
index eabc135d23..e86b23afd1 100644
--- a/spring-integration-core/build.xml
+++ b/spring-integration-core/build.xml
@@ -2,6 +2,7 @@
 <project name="spring-integration-core">
 
 	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/../build-spring-integration/package-bundle.xml"/>
 	<import file="../spring-build/standard/default.xml"/>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-integration-reference/build.xml b/spring-integration-reference/build.xml
index 1fa934a058..7360886477 100644
--- a/spring-integration-reference/build.xml
+++ b/spring-integration-reference/build.xml
@@ -4,4 +4,4 @@
 	<property file="${basedir}/../build.properties"/>
 	<import file="../spring-build/documentation/default.xml"/>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-integration-samples/build.xml b/spring-integration-samples/build.xml
index 2543057c45..ffaa9f3651 100644
--- a/spring-integration-samples/build.xml
+++ b/spring-integration-samples/build.xml
@@ -2,6 +2,14 @@
 <project name="spring-integration-samples">
 
 	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/../build-spring-integration/package-bundle.xml"/>
 	<import file="../spring-build/standard/default.xml"/>
 
+	<target name="package" depends="package-bundle.package">
+		<mkdir dir="${package.output.dir}/samples"/>
+		<copy todir="${package.output.dir}/samples">
+			<fileset dir="${basedir}/scripts"/>
+		</copy>
+	</target>
+
 </project>
diff --git a/build-spring-integration/resources/samples/cafeDemo.bat b/spring-integration-samples/scripts/cafeDemo.bat
similarity index 100%
rename from build-spring-integration/resources/samples/cafeDemo.bat
rename to spring-integration-samples/scripts/cafeDemo.bat
diff --git a/build-spring-integration/resources/samples/cafeDemo.sh b/spring-integration-samples/scripts/cafeDemo.sh
similarity index 100%
rename from build-spring-integration/resources/samples/cafeDemo.sh
rename to spring-integration-samples/scripts/cafeDemo.sh
diff --git a/build-spring-integration/resources/samples/cafeDemo.xml b/spring-integration-samples/scripts/cafeDemo.xml
similarity index 100%
rename from build-spring-integration/resources/samples/cafeDemo.xml
rename to spring-integration-samples/scripts/cafeDemo.xml