diff --git a/pom.xml b/pom.xml
index af42efb8c..4b7541a34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -969,7 +969,6 @@
                 <descriptor>src/main/assembly/src.xml</descriptor>
               </descriptors>
               <tarLongFileMode>gnu</tarLongFileMode>
-              <appendAssemblyId>false</appendAssemblyId>
               <finalName>apache-archiva-${project.version}-src</finalName>
             </configuration>
             <executions>
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
index c0cc3deed..ff66e9a6f 100644
--- a/src/main/assembly/src.xml
+++ b/src/main/assembly/src.xml
@@ -38,20 +38,20 @@
       <outputDirectory>/</outputDirectory>
       <excludes>
         <exclude>**/target/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/archiva-applet.jar</exclude>
-        <exclude>archiva-webapp/src/main/webapp/META-INF/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/images/redback/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/template/redback/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/WEB-INF/classes/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/WEB-INF/lib/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/WEB-INF/database/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/WEB-INF/logs/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/redback/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/css/redback/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/WEB-INF/jsp/redback/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/WEB-INF/template/redback/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/WEB-INF/logs/**</exclude>
-        <exclude>archiva-webapp/src/main/webapp/WEB-INF/temp/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/archiva-applet.jar</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/META-INF/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/images/redback/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/template/redback/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/classes/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/lib/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/database/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/logs/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/redback/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/css/redback/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/jsp/redback/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/template/redback/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/logs/**</exclude>
+        <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/temp/**</exclude>
       </excludes>
     </fileSet>
     <fileSet>