diff --git a/src/assembly/all.xml b/src/assembly/all.xml
index 900f3c98..36ba5f08 100644
--- a/src/assembly/all.xml
+++ b/src/assembly/all.xml
@@ -16,6 +16,8 @@
                 <include>org.springframework.ws:spring-ws-security</include>
             </includes>
             <binaries>
+                <outputDirectory></outputDirectory>
+                <outputFileNameMapping></outputFileNameMapping>
                 <includeDependencies>false</includeDependencies>
                 <unpack>true</unpack>
             </binaries>
diff --git a/src/assembly/full.xml b/src/assembly/full.xml
index c2faa16a..5b7636d6 100644
--- a/src/assembly/full.xml
+++ b/src/assembly/full.xml
@@ -19,25 +19,51 @@
                 <include>org.springframework.ws:spring-ws-security</include>
             </includes>
             <binaries>
+                <includeDependencies>false</includeDependencies>
                 <unpack>false</unpack>
             </binaries>
-            <sources>
-                <outputDirectory>modules/${artifactId}</outputDirectory>
-            </sources>
+            <!--
+                        <sources>
+                            <outputDirectoryMapping>modules/${artifactId}/src</outputDirectoryMapping>
+                        </sources>
+            -->
         </moduleSet>
     </moduleSets>
     <fileSets>
         <!-- Documentation -->
         <fileSet>
-             <directory>target/site/apidocs</directory>
-             <outputDirectory>docs/api</outputDirectory>
-       </fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>docs/api</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/reference</directory>
+            <outputDirectory>docs/reference</outputDirectory>
+        </fileSet>
+        <!-- Modules sources-->
+        <fileSet>
+            <outputDirectory>modules</outputDirectory>
+            <includes>
+                <include>xml/**/*</include>
+                <include>oxm/**/*</include>
+                <include>oxm-tiger/**/*</include>
+                <include>core/**/*</include>
+                <include>core-tiger/**/*</include>
+                <include>security/**/*</include>
+                <include>pom.xml</include>
+            </includes>
+            <excludes>
+                <exclude>**/target/**</exclude>
+                <exclude>**/target</exclude>
+                <exclude>**/*.iml</exclude>
+                <exclude>**/*.ipr</exclude>
+                <exclude>**/.classpath</exclude>
+                <exclude>**/.project</exclude>
+                <exclude>**/.settings</exclude>
+                <exclude>**/.settings/**</exclude>
+            </excludes>
+        </fileSet>
+        <!-- Samples -->
         <fileSet>
-             <directory>target/site/reference</directory>
-             <outputDirectory>docs/reference</outputDirectory>
-       </fileSet>
-       <!-- Samples -->
-       <fileSet>
             <directory>samples</directory>
             <outputDirectory>samples</outputDirectory>
             <includes>
@@ -52,9 +78,14 @@
                 <exclude>**/target/**</exclude>
                 <exclude>**/target</exclude>
                 <exclude>**/*.iml</exclude>
+                <exclude>**/*.ipr</exclude>
                 <exclude>**/META-INF/*</exclude>
                 <exclude>**/*.log</exclude>
                 <exclude>**/readme.txt</exclude>
+                <exclude>**/.classpath</exclude>
+                <exclude>**/.project</exclude>
+                <exclude>**/.settings</exclude>
+                <exclude>**/.settings/**</exclude>
             </excludes>
         </fileSet>
     </fileSets>
diff --git a/src/assembly/minimal.xml b/src/assembly/minimal.xml
index b9b9f911..d156e367 100644
--- a/src/assembly/minimal.xml
+++ b/src/assembly/minimal.xml
@@ -19,6 +19,7 @@
                 <include>org.springframework.ws:spring-ws-security</include>
             </includes>
             <binaries>
+                <includeDependencies>false</includeDependencies>
                 <unpack>false</unpack>
             </binaries>
         </moduleSet>