diff --git a/assembly/pom.xml b/assembly/pom.xml
index 37757cce1a..52beebd99e 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -325,11 +325,6 @@
               <descriptors>
                  <descriptor>src/main/descriptors/unix-src.xml</descriptor>  
               </descriptors>
-              <!--
-              <finalName>${pom.artifactId}-${pom.version}-src</finalName>
-              <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
-              <appendAssemblyId>false</appendAssemblyId>
-              -->
             </configuration>
           </execution>
           <execution>
@@ -342,10 +337,6 @@
               <descriptors>
                  <descriptor>src/main/descriptors/windows-src.xml</descriptor>  
               </descriptors>
-              <!--
-              <finalName>${pom.artifactId}-${pom.version}-src</finalName>
-              <appendAssemblyId>false</appendAssemblyId>
-              -->
             </configuration>
           </execution>
         </executions>
diff --git a/assembly/src/main/descriptors/unix-src.xml b/assembly/src/main/descriptors/unix-src.xml
index 0f5d1a9562..bf821ea4bb 100644
--- a/assembly/src/main/descriptors/unix-src.xml
+++ b/assembly/src/main/descriptors/unix-src.xml
@@ -29,6 +29,7 @@
         <include>**/*.jpeg</include>
         <include>**/*.jpg</include>
         <include>**/*.gif</include>
+        <include>**/*.png</include>
         <include>**/*.exe</include>
         <include>**/*.dll</include>
         <include>**/*.jar</include>
@@ -36,7 +37,15 @@
         <include>**/*.ks</include>
         <include>**/*.ts</include>
         <include>**/*.keystore</include>
+        <include>**/*.bin</include>
+        <include>**/*.jnilib</include>
+        <include>**/*.cert</include>
+        <include>assembly/src/release/bin/macosx/wrapper</include>
       </includes>
+      <excludes>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
     </fileSet>
 
     <!-- Text Files -->
@@ -50,6 +59,7 @@
         <exclude>**/*.jpeg</exclude>
         <exclude>**/*.jpg</exclude>
         <exclude>**/*.gif</exclude>
+        <exclude>**/*.png</exclude>
         <exclude>**/*.exe</exclude>
         <exclude>**/*.dll</exclude>
         <exclude>**/*.jar</exclude>
@@ -57,27 +67,28 @@
         <exclude>**/*.ks</exclude>
         <exclude>**/*.ts</exclude>
         <exclude>**/*.keystore</exclude>
-        <exclude>**/svn-commit*</exclude>
-        <exclude>**/target</exclude>
-        <exclude>**/target/**/*</exclude>
-        <exclude>**/build</exclude>
-        <exclude>**/build/**/*</exclude>
-        <exclude>**/data</exclude>
-        <exclude>**/data/**/*</exclude>
-        <exclude>**/activemq-data</exclude>
+        <exclude>**/*.bin</exclude>
+        <exclude>**/*.jnilib</exclude>
+        <exclude>**/*.cert</exclude>
+        <exclude>assembly/src/release/bin/macosx/wrapper</exclude>
+
+        <exclude>**/target/**</exclude>
+        <exclude>**/build/**</exclude>
+        <exclude>*/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>**/.*</exclude>
+        <exclude>**/.*/**</exclude>
+
         <exclude>**/surefire*</exclude>
-        <exclude>**/cobertura.ser</exclude>
+        <exclude>**/svn-commit*</exclude>
+
         <exclude>**/*.iml</exclude>
         <exclude>**/*.ipr</exclude>
         <exclude>**/*.iws</exclude>
+
+        <exclude>**/cobertura.ser</exclude>
+
       </excludes>
       <lineEnding>unix</lineEnding>
     </fileSet>
diff --git a/assembly/src/main/descriptors/windows-src.xml b/assembly/src/main/descriptors/windows-src.xml
index f00e498f3f..56cb03379a 100644
--- a/assembly/src/main/descriptors/windows-src.xml
+++ b/assembly/src/main/descriptors/windows-src.xml
@@ -29,6 +29,7 @@
         <include>**/*.jpeg</include>
         <include>**/*.jpg</include>
         <include>**/*.gif</include>
+        <include>**/*.png</include>
         <include>**/*.exe</include>
         <include>**/*.dll</include>
         <include>**/*.jar</include>
@@ -36,7 +37,15 @@
         <include>**/*.ks</include>
         <include>**/*.ts</include>
         <include>**/*.keystore</include>
+        <include>**/*.bin</include>
+        <include>**/*.jnilib</include>
+        <include>**/*.cert</include>
+        <include>assembly/src/release/bin/macosx/wrapper</include>
       </includes>
+      <excludes>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
     </fileSet>
 
     <!-- Text Files -->
@@ -50,6 +59,7 @@
         <exclude>**/*.jpeg</exclude>
         <exclude>**/*.jpg</exclude>
         <exclude>**/*.gif</exclude>
+        <exclude>**/*.png</exclude>
         <exclude>**/*.exe</exclude>
         <exclude>**/*.dll</exclude>
         <exclude>**/*.jar</exclude>
@@ -57,27 +67,28 @@
         <exclude>**/*.ks</exclude>
         <exclude>**/*.ts</exclude>
         <exclude>**/*.keystore</exclude>
-        <exclude>**/svn-commit*</exclude>
-        <exclude>**/target</exclude>
+        <exclude>**/*.bin</exclude>
+        <exclude>**/*.jnilib</exclude>
+        <exclude>**/*.cert</exclude>
+        <exclude>assembly/src/release/bin/macosx/wrapper</exclude>
+
         <exclude>**/target/**</exclude>
-        <exclude>**/build</exclude>
         <exclude>**/build/**</exclude>
-        <exclude>**/data</exclude>
-        <exclude>**/data/**</exclude>
-        <exclude>**/activemq-data</exclude>
+        <exclude>*/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>**/.*</exclude>
+        <exclude>**/.*/**</exclude>
+
         <exclude>**/surefire*</exclude>
-        <exclude>**/cobertura.ser</exclude>
+        <exclude>**/svn-commit*</exclude>
+
         <exclude>**/*.iml</exclude>
         <exclude>**/*.ipr</exclude>
         <exclude>**/*.iws</exclude>
+
+        <exclude>**/cobertura.ser</exclude>
+
       </excludes>
       <lineEnding>dos</lineEnding>
     </fileSet>