diff --git a/search-services/alfresco-solr/pom.xml b/search-services/alfresco-solr/pom.xml
index 5dc4d6cb4..fcd47347b 100644
--- a/search-services/alfresco-solr/pom.xml
+++ b/search-services/alfresco-solr/pom.xml
@@ -176,7 +176,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/classes/webapp/WEB-INF/lib</outputDirectory>
+                            <outputDirectory>${project.build.outputDirectory}/libs</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>false</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
@@ -187,26 +187,31 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>theMainClass</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <configuration>
+                            <excludes>
+                                <exclude>libs/**/*</exclude>
+                                <exclude>webapp/**/*</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>package-libs</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>libs</classifier>
+                            <includes>
+                                <include>libs/*.jar</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
-        <resources>
-             <resource>
-                   <targetPath>webapp</targetPath>
-                   <directory>src/main/webapp</directory>
-             </resource>
-             <resource>
-                   <targetPath>lib</targetPath>
-                   <directory>target/lib</directory>
-             </resource>
-        </resources>
     </build>
 </project>
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index 236df076c..40d13aabc 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -21,6 +21,12 @@
           <artifactId>alfresco-solr</artifactId>
           <version>${project.version}</version>
       </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-solr</artifactId>
+            <version>${project.version}</version>
+            <classifier>libs</classifier>
+        </dependency>
     </dependencies>
     <build>
         <finalName>alfresco-solr-distribution-${project.version}</finalName>
@@ -66,6 +72,46 @@
                           </artifactItems>
                       </configuration>
                   </execution>
+                  <execution>
+                      <id>unpack-solr-libs</id>
+                      <phase>validate</phase>
+                      <goals>
+                          <goal>unpack</goal>
+                      </goals>
+                      <configuration>
+                          <artifactItems>
+                              <artifactItem>
+                                  <groupId>org.alfresco</groupId>
+                                  <artifactId>alfresco-solr</artifactId>
+                                  <version>${project.version}</version>
+                                  <classifier>libs</classifier>
+                                  <outputDirectory>${project.build.directory}/solr-libs</outputDirectory>
+                              </artifactItem>
+                          </artifactItems>
+                      </configuration>
+                  </execution>
+                  <execution>
+                      <id>copy</id>
+                      <phase>validate</phase>
+                      <goals>
+                          <goal>copy</goal>
+                      </goals>
+                      <configuration>
+                          <artifactItems>
+                              <artifactItem>
+                                  <groupId>org.alfresco</groupId>
+                                  <artifactId>alfresco-solr</artifactId>
+                                  <version>${project.version}</version>
+                                  <outputDirectory>${project.build.directory}/solr-libs/libs</outputDirectory>
+                              </artifactItem>
+                          </artifactItems>
+                          <outputDirectory>${project.build.directory}/wars</outputDirectory>
+                          <overWriteReleases>false</overWriteReleases>
+                          <overWriteSnapshots>true</overWriteSnapshots>
+                      </configuration>
+                  </execution>
+
+
               </executions>
           </plugin>
             <plugin>
diff --git a/search-services/packaging/src/assembly/solr-distribution.xml b/search-services/packaging/src/assembly/solr-distribution.xml
index 71c0c3114..2cd55e57a 100644
--- a/search-services/packaging/src/assembly/solr-distribution.xml
+++ b/search-services/packaging/src/assembly/solr-distribution.xml
@@ -10,13 +10,10 @@
         <fileSet>
             <directory>target/solr-${solr.version}</directory>
             <outputDirectory>solr</outputDirectory>
-            <excludes>
-                <exclude>**/web.xml</exclude>
-            </excludes>
         </fileSet>
         <!-- Solr config -->
         <fileSet>
-            <directory>target/solr/instance</directory>
+            <directory>target/alfresco-solr/solr/instance</directory>
             <outputDirectory>solr/server/solr/</outputDirectory>
             <excludes>
                 <exclude>**/workspace-SpacesStore/**</exclude>
@@ -24,6 +21,16 @@
                 <exclude>context.xml</exclude>
             </excludes>
         </fileSet>
+        <!-- Solr libs -->
+        <fileSet>
+            <directory>target/solr-libs/libs</directory>
+            <outputDirectory>solr/server/solr-webapp/webapp/WEB-INF/lib</outputDirectory>
+            <excludes>
+                <exclude>**/workspace-SpacesStore/**</exclude>
+                <exclude>**/archive-SpacesStore/**</exclude>
+                <exclude>context.xml</exclude>
+            </excludes>
+        </fileSet>
         <!-- Just create an empty data directory -->
         <fileSet>
           <directory>src/assembly</directory>
@@ -32,42 +39,5 @@
             <exclude>*</exclude>
           </excludes>
         </fileSet>
-
-        <!-- Include all classes from alfresco-solr -->
-        <fileSet>
-            <directory>target/alfresco-solr</directory>
-            <outputDirectory>solr/server/solr-webapp/webapp/WEB-INF/classes</outputDirectory>
-            <includes>
-                <include>org/**/*</include>
-            </includes>
-            <excludes>
-                <exclude>META-INF</exclude>
-                <exclude>webapp</exclude>
-            </excludes>
-        </fileSet>
-        <!-- Replace web.xml with alfresco solr config -->
-        <fileSet>
-            <directory>target/alfresco-solr/webapp</directory>
-            <outputDirectory>solr/server/solr-webapp/webapp</outputDirectory>
-            <includes>
-                <include>**/web.xml</include>
-            </includes>
-            <excludes>
-                <exclude></exclude>
-            </excludes>
-        </fileSet>
-        <!-- Port over solr alfresco stores -->
-        <fileSet>
-            <directory>target/alfresco-solr/solr</directory>
-            <outputDirectory>solr/server/solr/</outputDirectory>
-            <includes>
-                <include>instance/**.*</include>
-            </includes>
-            <excludes>
-                <exclude>**/workspace-SpacesStore/**</exclude>
-                <exclude>**/archive-SpacesStore/**</exclude>
-                <exclude>context.xml</exclude>
-            </excludes>
-        </fileSet>
     </fileSets>
 </assembly>