diff --git a/README.txt b/README.txt
index b6af85b..8679b53 100644
--- a/README.txt
+++ b/README.txt
@@ -48,7 +48,7 @@
 
    The JAR packages can be found in the target folder:
 
-   target/solr3x-plugin-mcf-<VERSION>.jar where <VERSION> is the release version
+   target/apache-manifoldcf-solr-3.x-plugin-<VERSION>.jar where <VERSION> is the release version
 
 Getting Started
 ---------------
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
index 1621ebf..8988d4b 100644
--- a/src/main/assembly/bin.xml
+++ b/src/main/assembly/bin.xml
@@ -21,24 +21,9 @@
         <format>tar.gz</format>
         <format>zip</format>
     </formats>
-    <moduleSets>
-        <moduleSet>
-            <excludes>
-            </excludes>
-            <binaries>
-                <outputDirectory>lib</outputDirectory>
-                <unpack>false</unpack>
-                <dependencySets>
-                    <dependencySet>
-                        <excludes>
-                            <exclude>org.slf4j:*</exclude>
-                        </excludes>
-                    </dependencySet>
-                </dependencySets>
-            </binaries>
-        </moduleSet>
-    </moduleSets>
+    
     <fileSets>
+        
         <fileSet>
             <directory>target</directory>
             <outputDirectory/>
@@ -48,9 +33,13 @@
                 <include>${project.artifactId}-${project.version}.jar</include>
             </includes>
         </fileSet>
+        
         <fileSet>
+            <directory>.</directory>
+            <outputDirectory/>
+            <fileMode>644</fileMode>
+            <directoryMode>755</directoryMode>
             <includes>
-                <include>**/target/*.jar</include>
                 <include>README.txt</include>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
index 8e67674..d540555 100644
--- a/src/main/assembly/src.xml
+++ b/src/main/assembly/src.xml
@@ -24,10 +24,17 @@
     <fileSets>
         <!-- Release materials -->
         <fileSet>
+            <directory>.</directory>
+            <outputDirectory/>
+            <fileMode>644</fileMode>
+            <directoryMode>755</directoryMode>
             <excludes>
                 <exclude>**/.*</exclude>
                 <exclude>**/.*/**</exclude>
                 <exclude>**/*.iml/**</exclude>
+                <exclude>**/*.patch/**</exclude>
+                <exclude>**/*.sh/**</exclude>
+                <exclude>**/*.bat/**</exclude>
                 <exclude>**/target/**</exclude>
                 <exclude>**/lib/**</exclude>
                 <exclude>**/data/**</exclude>