diff --git a/dist/richfaces-components-ui/pom.xml b/dist/richfaces-components-ui/pom.xml
index d6bdd72f..d1d3ef13 100644
--- a/dist/richfaces-components-ui/pom.xml
+++ b/dist/richfaces-components-ui/pom.xml
@@ -34,7 +34,7 @@
     <name>RichFaces UI Components UI</name>
 
     <properties>
-        <shade-transformers.version>6</shade-transformers.version>
+        <shade-transformers.version>7-SNAPSHOT</shade-transformers.version>
         <faces-vdl-documentation.version>1</faces-vdl-documentation.version>
         <assembly.projects.group>org.richfaces.ui</assembly.projects.group>
     </properties>
@@ -95,6 +95,13 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/assembly</directory>
+                <targetPath>${project.build.directory}/assembly</targetPath>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
             <!-- unpack necessary dependencies for collecting sources, jsdoc and javadocs -->
@@ -123,14 +130,14 @@
                 <executions>
                     <execution>
                         <id>assembly</id>
-                        <phase>package</phase>
+                        <phase>prepare-package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
                         <configuration>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
-                                <descriptor>assembler.xml</descriptor>
+                                <descriptor>${project.build.directory}/assembly/assembler-jar.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>
@@ -142,7 +149,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>assembler-sources.xml</descriptor>
+                                <descriptor>${project.build.directory}/assembly/assembler-sources.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>
@@ -216,12 +223,12 @@
                         <configuration>
                             <transformationSets>
                                 <transformationSet>
-                                    <dir>src/main/properties</dir>
-                                    <stylesheet>target/resources/xsl/common.xsl</stylesheet>
+                                    <dir>${basedir}/src/main/properties</dir>
+                                    <stylesheet>${project.build.directory}/resources/xsl/common.xsl</stylesheet>
                                     <parameters>
                                         <parameter>
                                             <name>output-dir</name>
-                                            <value>target/vdldoc/</value>
+                                            <value>${project.build.directory}/vdldoc/</value>
                                         </parameter>
                                     </parameters>
                                     <fileMappers>
@@ -253,7 +260,7 @@
                                 </goals>
                                 <configuration>
                                     <descriptors>
-                                        <descriptor>src/main/assembly/vdldoc-assembly.xml</descriptor>
+                                        <descriptor>${project.build.directory}/assembly/assembler-vdldoc.xml</descriptor>
                                     </descriptors>
                                 </configuration>
                             </execution>
diff --git a/dist/richfaces-components-ui/assembler.xml b/dist/richfaces-components-ui/src/main/assembly/assembler-jar.xml
similarity index 89%
rename from dist/richfaces-components-ui/assembler.xml
rename to dist/richfaces-components-ui/src/main/assembly/assembler-jar.xml
index 38f0bb70..ea5b817c 100644
--- a/dist/richfaces-components-ui/assembler.xml
+++ b/dist/richfaces-components-ui/src/main/assembly/assembler-jar.xml
@@ -9,6 +9,9 @@
     <containerDescriptorHandlers>
         <containerDescriptorHandler>
             <handlerName>faces-xml</handlerName>
+            <configuration>
+                <outputDirectory>${project.build.directory}/taglibs</outputDirectory>
+            </configuration>
         </containerDescriptorHandler>
         <containerDescriptorHandler>
             <handlerName>resource-mappings-properties</handlerName>
@@ -16,6 +19,7 @@
         <containerDescriptorHandler>
             <handlerName>taglib-xml</handlerName>
             <configuration>
+                <outputDirectory>${project.build.directory}/taglibs</outputDirectory>
                 <taglibs>
                     <taglib>
                         <targetNamespace>http://richfaces.org/a4j</targetNamespace>
diff --git a/dist/richfaces-components-ui/assembler-sources.xml b/dist/richfaces-components-ui/src/main/assembly/assembler-sources.xml
similarity index 100%
rename from dist/richfaces-components-ui/assembler-sources.xml
rename to dist/richfaces-components-ui/src/main/assembly/assembler-sources.xml
diff --git a/dist/richfaces-components-ui/src/main/assembly/vdldoc-assembly.xml b/dist/richfaces-components-ui/src/main/assembly/assembler-vdldoc.xml
similarity index 88%
rename from dist/richfaces-components-ui/src/main/assembly/vdldoc-assembly.xml
rename to dist/richfaces-components-ui/src/main/assembly/assembler-vdldoc.xml
index 88aa1ed4..1fd81e26 100644
--- a/dist/richfaces-components-ui/src/main/assembly/vdldoc-assembly.xml
+++ b/dist/richfaces-components-ui/src/main/assembly/assembler-vdldoc.xml
@@ -1,9 +1,11 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    
     <id>vdldocs</id>
     <formats>
         <format>jar</format>
     </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
         <fileSet>
             <directory>${basedir}/target/vdldoc</directory>