diff --git a/assembly/pom.xml b/assembly/pom.xml
index d4102072cf..86985f80e3 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -236,10 +236,10 @@
             <configuration>
               <tasks>
                 <jar destfile="target/run.jar" basedir="target/classes">
-		              <include name="org/apache/activemq/console/Main*.class"/>
-		              <manifest>
-		                <attribute name="Main-Class" value="org.apache.activemq.console.Main"/>
-		              </manifest>
+                      <include name="org/apache/activemq/console/Main*.class"/>
+                      <manifest>
+                        <attribute name="Main-Class" value="org.apache.activemq.console.Main"/>
+                      </manifest>
                 </jar>
               </tasks>
             </configuration>
@@ -315,7 +315,31 @@
               <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </execution>
-	</executions>
+          <execution>
+            <id>unix-src</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                 <descriptor>src/main/descriptors/unix-src.xml</descriptor>  
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>windows-src</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                 <descriptor>src/main/descriptors/windows-src.xml</descriptor>  
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <!-- plugin>
         <groupId>org.apache.activemq</groupId>
@@ -338,7 +362,7 @@
             <artifactId>maven-assembly-plugin</artifactId>
             <version>2.1</version>
             <executions>
-	      <execution>
+              <execution>
                 <id>src</id>
                 <phase>package</phase>
                 <goals>
@@ -352,7 +376,7 @@
               </execution>
             </executions>
           </plugin>
-	</plugins>
+        </plugins>
       </build>
     </profile>
   </profiles>
diff --git a/assembly/src/main/descriptors/src-bin.xml b/assembly/src/main/descriptors/src-bin.xml
deleted file mode 100644
index 6baf7c06a5..0000000000
--- a/assembly/src/main/descriptors/src-bin.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<assembly>
-  <id>src</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>src</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-      <excludes>
-        <exclude>**/target</exclude>
-        <exclude>**/target/**/*</exclude>
-        <exclude>**/build</exclude>
-        <exclude>**/build/**/*</exclude>
-	<exclude>**/data</exclude>
-	<exclude>**/data/**/*</exclude>
-	<exclude>**/activemq-data</exclude>
-	<exclude>**/activemq-data/**/*</exclude>
-	<exclude>**/.settings</exclude>
-        <exclude>**/.settings/**/*</exclude>
-	<exclude>**/eclipse-classes</exclude>
-	<exclude>**/eclipse-classes/**/*</exclude>
-	<exclude>**/.classpath</exclude>
-        <exclude>**/.project</exclude>
-        <exclude>**/.wtpmodules</exclude>
-        <exclude>**/surefire*</exclude>
-        <exclude>**/cobertura.ser</exclude>
-	<exclude>**/*.iml</exclude>
-	<exclude>**/*.ipr</exclude>
-	<exclude>**/*.iws</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/assembly/src/main/descriptors/unix-src.xml b/assembly/src/main/descriptors/unix-src.xml
new file mode 100644
index 0000000000..8f24328b06
--- /dev/null
+++ b/assembly/src/main/descriptors/unix-src.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <!-- Binary Files -->
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>src</outputDirectory>
+      <includes>
+        <include>**/*.jpeg</include>
+        <include>**/*.jpg</include>
+        <include>**/*.gif</include>
+        <include>**/*.png</include>
+        <include>**/*.exe</include>
+        <include>**/*.dll</include>
+        <include>**/*.jar</include>
+        <include>**/*.so</include>
+        <include>**/*.ks</include>
+        <include>**/*.ts</include>
+        <include>**/*.keystore</include>
+        <include>**/*.bin</include>
+        <include>**/*.jnilib</include>
+        <include>**/*.cert</include>
+        <include>assembly/src/release/bin/*/wrapper</include>
+      </includes>
+      <excludes>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
+    </fileSet>
+
+    <!-- Text Files -->
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>src</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <excludes>
+        <exclude>**/*.jpeg</exclude>
+        <exclude>**/*.jpg</exclude>
+        <exclude>**/*.gif</exclude>
+        <exclude>**/*.png</exclude>
+        <exclude>**/*.exe</exclude>
+        <exclude>**/*.dll</exclude>
+        <exclude>**/*.jar</exclude>
+        <exclude>**/*.so</exclude>
+        <exclude>**/*.ks</exclude>
+        <exclude>**/*.ts</exclude>
+        <exclude>**/*.keystore</exclude>
+        <exclude>**/*.bin</exclude>
+        <exclude>**/*.jnilib</exclude>
+        <exclude>**/*.cert</exclude>
+        <exclude>assembly/src/release/bin/*/wrapper</exclude>
+        <exclude>**/target/**</exclude>
+        <exclude>**/build/**</exclude>
+        <exclude>data/**</exclude>
+        <exclude>*/data/**</exclude>
+        <exclude>activemq-data/**</exclude>
+        <exclude>*/activemq-data/**</exclude>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/.*</exclude>
+        <exclude>**/.*/**</exclude>
+
+        <exclude>**/surefire*</exclude>
+        <exclude>**/svn-commit*</exclude>
+
+        <exclude>**/*.iml</exclude>
+        <exclude>**/*.ipr</exclude>
+        <exclude>**/*.iws</exclude>
+
+        <exclude>**/cobertura.ser</exclude>
+
+      </excludes>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/assembly/src/main/descriptors/windows-src.xml b/assembly/src/main/descriptors/windows-src.xml
new file mode 100644
index 0000000000..9cdfb755f7
--- /dev/null
+++ b/assembly/src/main/descriptors/windows-src.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <!-- Binary Files -->
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>src</outputDirectory>
+      <includes>
+        <include>**/*.jpeg</include>
+        <include>**/*.jpg</include>
+        <include>**/*.gif</include>
+        <include>**/*.png</include>
+        <include>**/*.exe</include>
+        <include>**/*.dll</include>
+        <include>**/*.jar</include>
+        <include>**/*.so</include>
+        <include>**/*.ks</include>
+        <include>**/*.ts</include>
+        <include>**/*.keystore</include>
+        <include>**/*.bin</include>
+        <include>**/*.jnilib</include>
+        <include>**/*.cert</include>
+        <include>assembly/src/release/bin/*/wrapper</include>
+      </includes>
+      <excludes>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
+    </fileSet>
+
+    <!-- Text Files -->
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>src</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <excludes>
+        <exclude>**/*.jpeg</exclude>
+        <exclude>**/*.jpg</exclude>
+        <exclude>**/*.gif</exclude>
+        <exclude>**/*.png</exclude>
+        <exclude>**/*.exe</exclude>
+        <exclude>**/*.dll</exclude>
+        <exclude>**/*.jar</exclude>
+        <exclude>**/*.so</exclude>
+        <exclude>**/*.ks</exclude>
+        <exclude>**/*.ts</exclude>
+        <exclude>**/*.keystore</exclude>
+        <exclude>**/*.bin</exclude>
+        <exclude>**/*.jnilib</exclude>
+        <exclude>**/*.cert</exclude>
+        <exclude>assembly/src/release/bin/*/wrapper</exclude>
+
+        <exclude>**/target/**</exclude>
+        <exclude>**/build/**</exclude>
+        <exclude>data/**</exclude>
+        <exclude>*/data/**</exclude>
+        <exclude>activemq-data/**</exclude>
+        <exclude>*/activemq-data/**</exclude>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/.*</exclude>
+        <exclude>**/.*/**</exclude>
+
+        <exclude>**/surefire*</exclude>
+        <exclude>**/svn-commit*</exclude>
+
+        <exclude>**/*.iml</exclude>
+        <exclude>**/*.ipr</exclude>
+        <exclude>**/*.iws</exclude>
+
+        <exclude>**/cobertura.ser</exclude>
+
+      </excludes>
+      <lineEnding>dos</lineEnding>
+    </fileSet>
+  </fileSets>
+</assembly>