diff --git a/enterprise-update/assemblies/update.xml b/enterprise-update/assemblies/update.xml
index 905fe0c3c4..3bc103a129 100644
--- a/enterprise-update/assemblies/update.xml
+++ b/enterprise-update/assemblies/update.xml
@@ -9,19 +9,14 @@
         <format>zip</format>
     </formats>
 
-    <fileSets>
-        <fileSet>
-            <outputDirectory></outputDirectory>
-            <directory>assets</directory>
-        </fileSet>
-    </fileSets>
-
+    <includeBaseDirectory>false</includeBaseDirectory>
+		
     <dependencySets>
         <!-- alfresco web app -->
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <useStrictFiltering>true</useStrictFiltering>
-            <outputDirectory>assets/web-server/webapps</outputDirectory>
+            <outputDirectory>update/assets/web-server/webapps</outputDirectory>
             <outputFileNameMapping>alfresco.war</outputFileNameMapping>
             <includes>
                 <include>org.alfresco:alfresco-enterprise:war</include>
@@ -32,24 +27,13 @@
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <useStrictFiltering>true</useStrictFiltering>
-            <outputDirectory>assets/web-server/webapps</outputDirectory>
+            <outputDirectory>update/assets/web-server/webapps</outputDirectory>
             <outputFileNameMapping>share.war</outputFileNameMapping>
             <includes>
                 <include>org.alfresco:share:war</include>
             </includes>
         </dependencySet>
 		
-		<!-- The update tool itself -->
-		<dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <useStrictFiltering>true</useStrictFiltering>
-            <outputDirectory>bin</outputDirectory>
-            <outputFileNameMapping>alfresco-update-tool.jar</outputFileNameMapping>
-            <includes>
-                <include>org.alfresco:alfresco-update-tool:jar</include>
-            </includes>
-        </dependencySet>
-
     </dependencySets>
 
 </assembly>
diff --git a/enterprise-update/assemblies/updateTool.xml b/enterprise-update/assemblies/updateTool.xml
new file mode 100644
index 0000000000..0269281979
--- /dev/null
+++ b/enterprise-update/assemblies/updateTool.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>update-tool</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+	
+	<files>
+	    <file>
+			<source>${project.basedir}/target/updatePackage.zip</source>
+			<outputDirectory>updates</outputDirectory>
+		</file>
+	</files>
+	
+	<dependencySets>
+	
+		<!-- The update tool itself -->
+		<dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useStrictFiltering>true</useStrictFiltering>
+            <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>alfresco-update-tool.jar</outputFileNameMapping>
+            <includes>
+                <include>org.alfresco:alfresco-update-tool:jar</include>
+            </includes>
+        </dependencySet>
+
+		<dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useStrictFiltering>true</useStrictFiltering>
+            <outputDirectory></outputDirectory>
+			<unpack>true</unpack>
+			<unpackOptions>
+			   <lineEnding>keep</lineEnding>
+			</unpackOptions>
+            <includes>
+                <include>org.alfresco:alfresco-update-tool-distribution:jar</include>
+            </includes>
+        </dependencySet>
+
+    </dependencySets>
+
+</assembly>
diff --git a/enterprise-update/pom.xml b/enterprise-update/pom.xml
index 12a5810fa2..6cb518f80f 100644
--- a/enterprise-update/pom.xml
+++ b/enterprise-update/pom.xml
@@ -34,15 +34,26 @@
             <version>${alfresco.updatetool.version}</version>
             <type>jar</type>
         </dependency>
+		
+		<dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-update-tool-distribution</artifactId>
+            <version>${alfresco.updatetool.version}</version>
+            <type>jar</type>
+        </dependency>
+		
     </dependencies>  
 
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
+				
                 <executions>
                     <execution>
+					
                         <id>update</id>
+						
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
@@ -51,6 +62,20 @@
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
                                 <descriptor>assemblies/update.xml</descriptor>
+                            </descriptors>
+							<finalName>updatePackage</finalName>
+                        </configuration>
+                    </execution>
+					<execution>
+                        <id>update-tool</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+								<descriptor>assemblies/updateTool.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>