diff --git a/assembly/pom.xml b/assembly/pom.xml
index be76c16927..045d0b345f 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -350,15 +350,27 @@
             <artifactId>maven-assembly-plugin</artifactId>
             <version>2.1</version>
             <executions>
-          <execution>
-                <id>src</id>
+              <execution>
+                <id>unix-src</id>
                 <phase>package</phase>
                 <goals>
                   <goal>attached</goal>
                 </goals>
                 <configuration>
                   <descriptors>
-                    <descriptor>src/main/descriptors/src-bin.xml</descriptor>
+                    <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+			  <execution>
+                <id>windows-src</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>attached</goal>
+                </goals>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/main/descriptors/windows-src.xml</descriptor>
                   </descriptors>
                 </configuration>
               </execution>
diff --git a/assembly/src/main/descriptors/unix-src.xml b/assembly/src/main/descriptors/unix-src.xml
index 8f24328b06..8af3ac944b 100644
--- a/assembly/src/main/descriptors/unix-src.xml
+++ b/assembly/src/main/descriptors/unix-src.xml
@@ -73,8 +73,8 @@
         <exclude>assembly/src/release/bin/*/wrapper</exclude>
         <exclude>**/target/**</exclude>
         <exclude>**/build/**</exclude>
-        <exclude>data/**</exclude>
-        <exclude>*/data/**</exclude>
+        <!-- exclude>data/**</exclude>
+        <exclude>*/data/**</exclude -->
         <exclude>activemq-data/**</exclude>
         <exclude>*/activemq-data/**</exclude>
         <exclude>**/eclipse-classes/**</exclude>
diff --git a/assembly/src/main/descriptors/windows-src.xml b/assembly/src/main/descriptors/windows-src.xml
index 9cdfb755f7..2888a8cadf 100644
--- a/assembly/src/main/descriptors/windows-src.xml
+++ b/assembly/src/main/descriptors/windows-src.xml
@@ -74,8 +74,8 @@
 
         <exclude>**/target/**</exclude>
         <exclude>**/build/**</exclude>
-        <exclude>data/**</exclude>
-        <exclude>*/data/**</exclude>
+        <!-- exclude>data/**</exclude>
+        <exclude>*/data/**</exclude -->
         <exclude>activemq-data/**</exclude>
         <exclude>*/activemq-data/**</exclude>
         <exclude>**/eclipse-classes/**</exclude>