diff --git a/distribution/pom.xml b/distribution/pom.xml
index ef792f7f4b..a6a7a0330a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -30,6 +30,20 @@
             </exclusions>
         </dependency>
 
+        <!-- Solr4 Distribution -->
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-solr4-distribution</artifactId>
+            <version>${alfresco.share.version}</version>
+            <type>zip</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <!-- Share Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
@@ -65,6 +79,13 @@
                                     <version>${alfresco.platform.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-solr4-distribution</artifactId>
+                                    <version>${alfresco.platform.version}</version>
+                                    <type>zip</type>
+                                    <outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-share-distribution</artifactId>
diff --git a/distribution/src/assembly/full-distribution.xml b/distribution/src/assembly/full-distribution.xml
index 3017ca6a9e..d05bef26aa 100644
--- a/distribution/src/assembly/full-distribution.xml
+++ b/distribution/src/assembly/full-distribution.xml
@@ -18,23 +18,41 @@
             <outputDirectory/>
         </fileSet>
 
-        <!-- Share services WAR -->
+        <!-- Solr4 Distribution -->
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.platform.version}</directory>
+            <directory>${project.build.directory}/dependency/solr4</directory>
+            <outputDirectory>solr4</outputDirectory>
+            <excludes>
+                <exclude>solr4.war</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/dependency/solr4</directory>
+            <outputDirectory>web-server/webapps</outputDirectory>
+            <includes>
+                <include>solr4.war</include>
+            </includes>
+        </fileSet>
+
+        <!-- Share -->
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</directory>
             <includes>
                 <include>share.war</include>
             </includes>
             <outputDirectory>web-server/webapps</outputDirectory>
         </fileSet>
-
-        <!-- Share services AMP -->
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.platform.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</directory>
             <includes>
                 <include>*.amp</include>
             </includes>
             <outputDirectory>amps_share</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
+            <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
+        </fileSet>
     </fileSets>
 
 </assembly>
diff --git a/installer/pom.xml b/installer/pom.xml
index 6a5cc1b6ac..800e692221 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -221,23 +221,6 @@
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/distribution/${alfresco.package.name}-${project.version}/web-server/webapps</outputDirectory>
                                 </artifactItem>
-                                <!-- Solr4 Distribution -->
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-solr4-distribution</artifactId>
-                                    <version>${alfresco.platform.version}</version>
-                                    <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/distribution/${alfresco.package.name}-${project.version}/solr4</outputDirectory>
-                                    <excludes>solr4.war</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-solr4-distribution</artifactId>
-                                    <version>${alfresco.platform.version}</version>
-                                    <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/distribution/${alfresco.package.name}-${project.version}/web-server/webapps</outputDirectory>
-                                    <includes>solr4.war</includes>
-                                </artifactItem>
                                 <!-- WCMQS Distribution -->
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>