diff --git a/instructions/FOSS_repo_list.pl b/instructions/FOSS_repo_list.pl
index e5b6005d4b..8a5ed3d0b8 100644
--- a/instructions/FOSS_repo_list.pl
+++ b/instructions/FOSS_repo_list.pl
@@ -53,7 +53,7 @@
    { name => "zm-web-client",                        },
    { name => "zm-webclient-portal-example",          },
    { name => "zm-zcs",                               },
-   { name => "zm-zcs-lib",                           },
+   { name => "zm-zcs-lib",                          branch => "feature/solr"},
    { name => "zm-ssdb-ephemeral-store",              },
    { name => "zm-zimlets",                           },
 );
diff --git a/instructions/bundling-scripts/zimbra-core.sh b/instructions/bundling-scripts/zimbra-core.sh
index d4fcd487fa..91e58859ab 100755
--- a/instructions/bundling-scripts/zimbra-core.sh
+++ b/instructions/bundling-scripts/zimbra-core.sh
@@ -600,6 +600,7 @@ main()
       "commons-lang-2.6.jar"
       "commons-net-3.3.jar"
       "commons-pool-1.6.jar"
+      "commons-pool2-2.4.2.jar"
       "concurrentlinkedhashmap-lru-1.3.1.jar"
       "curator-client-2.0.1-incubating.jar"
       "curator-client-2.0.1-incubating.jar"
@@ -608,6 +609,7 @@ main()
       "curator-x-discovery-2.0.1-incubating.jar"
       "cxf-2.7.18.jar"
       "dom4j-1.5.2.jar"
+      "ehcache-3.1.2.jar"
       "freemarker-2.3.19.jar"
       "ganymed-ssh2-build210.jar"
       "gifencoder-0.9.jar"
@@ -618,13 +620,13 @@ main()
       "httpclient-4.5.2.jar"
       "httpcore-4.4.5.jar"
       "httpcore-nio-4.4.5.jar"
-      "httpmime-4.3.1.jar"
+      "httpmime-4.3.5.jar"
       "ical4j-0.9.16-patched.jar"
       "icu4j-4.8.1.1.jar"
-      "jackson-mapper-asl-1.9.13.jar"
       "jackson-core-asl-1.9.13.jar"
-      "jackson-xc-1.9.13.jar"
+      "jackson-mapper-asl-1.9.13.jar"
       "jackson-smile-1.9.13.jar"
+      "jackson-xc-1.9.13.jar"
       "jamm-0.2.5.jar"
       "javax.servlet-api-3.1.0.jar"
       "javax.ws.rs-api-2.0-m10.jar"
@@ -637,6 +639,7 @@ main()
       "jcommon-1.0.21.jar"
       "jcs-1.3.jar"
       "jdom-1.1.jar"
+      "jedis-2.9.0.jar"
       "jersey-client-1.11.jar"
       "jersey-core-1.11.jar"
       "jersey-json-1.11.jar"
@@ -644,28 +647,28 @@ main()
       "jersey-server-1.11.jar"
       "jersey-servlet-1.11.jar"
       "jfreechart-1.0.15.jar"
+      "jline-0.9.93.jar"
       "jna-3.4.0.jar"
       "jsr181-api-1.0-MR1.jar"
       "jsr311-api-1.1.1.jar"
       "junixsocket-common-2.0.4.jar"
       "junixsocket-demo-2.0.4.jar"
       "junixsocket-mysql-2.0.4.jar"
-      "junixsocket-rmi-2.0.4.jar"
       "junixsocket-native-common-2.0.4.jar"
-      "native-lib-loader-2.0.2.jar"
+      "junixsocket-rmi-2.0.4.jar"
       "jython-standalone-2.5.2.jar"
-      "jline-0.9.93.jar"
       "jzlib-1.0.7.jar"
       "libidn-1.24.jar"
       "log4j-1.2.16.jar"
-      "lucene-analyzers-3.5.0.jar"
-      "lucene-core-3.5.0.jar"
-      "lucene-smartcn-3.5.0.jar"
+      "lucene-analyzers-common-6.6.0.jar"
+      "lucene-core-6.6.0.jar"
       "mail-1.4.5.jar"
       "mariadb-java-client-1.1.8.jar"
       "mina-core-2.0.4.jar"
+      "native-lib-loader-2.0.2.jar"
       "neethi-3.0.2.jar"
       "nekohtml-1.9.13.1z.jar"
+      "noggit-0.7.jar"
       "oauth-20100527.jar"
       "owasp-java-html-sanitizer-r239.jar"
       "policy-2.3.jar"
@@ -675,6 +678,8 @@ main()
       "smackx-3.1.0.jar"
       "smackx-debug-3.2.1.jar"
       "smackx-jingle-3.2.1.jar"
+      "solr-core-6.6.0.jar"
+      "solr-solrj-6.6.0.jar"
       "spring-aop-3.0.7.RELEASE.jar"
       "spring-asm-3.0.7.RELEASE.jar"
       "spring-beans-3.0.7.RELEASE.jar"
@@ -682,8 +687,6 @@ main()
       "spring-core-3.0.7.RELEASE.jar"
       "spring-expression-3.0.7.RELEASE.jar"
       "spymemcached-2.12.1.jar"
-      "jedis-2.9.0.jar"
-      "commons-pool2-2.4.2.jar"
       "sqlite-jdbc-3.7.15-M1.jar"
       "stax-ex-1.7.7.jar"
       "stax2-api-3.1.1.jar"
@@ -696,9 +699,8 @@ main()
       "xmlschema-core-2.0.3.jar"
       "yuicompressor-2.4.2-zimbra.jar"
       "zkclient-0.1.0.jar"
-      "zookeeper-3.4.5.jar"
       "zm-ews-stub-2.0.jar"
-      "ehcache-3.1.2.jar"
+      "zookeeper-3.4.5.jar"
    )
 
    for i in "${zimbrathirdpartyjars[@]}"
diff --git a/instructions/bundling-scripts/zimbra-store.sh b/instructions/bundling-scripts/zimbra-store.sh
index bfd898c6ad..6adbcde5cc 100755
--- a/instructions/bundling-scripts/zimbra-store.sh
+++ b/instructions/bundling-scripts/zimbra-store.sh
@@ -138,6 +138,20 @@ main()
     cp ${repoDir}/zm-taglib/build/zm-taglib*.jar         ${repoDir}/zm-build/${currentPackage}/opt/zimbra/jetty_base/webapps/service/WEB-INF/lib
     cp ${repoDir}/zm-zimlets/build/dist/zimlettaglib.jar ${repoDir}/zm-build/${currentPackage}/opt/zimbra/jetty_base/webapps/service/WEB-INF/lib
 
+    solrJars=(
+        "httpmime-4.3.5.jar"
+        "lucene-analyzers-common-6.6.0.jar"
+        "lucene-core-6.6.0.jar"
+        "noggit-0.7.jar"
+        "solr-core-6.6.0.jar"
+        "solr-solrj-6.6.0.jar"
+        "zookeeper-3.4.5.jar"
+    )
+    for i in "${solrJars[@]}"
+    do
+        cp ${repoDir}/zm-zcs-lib/build/dist/${i} ${repoDir}/zm-build/${currentPackage}/opt/zimbra/jetty_base/webapps/service/WEB-INF/lib
+    done
+
     echo "\t\t++++++++++ zimbra.war content ++++++++++" >> ${buildLogFile}
     mkdir -p ${repoDir}/zm-build/${currentPackage}/opt/zimbra/jetty_base/webapps/zimbra
     ( cd ${repoDir}/zm-build/${currentPackage}/opt/zimbra/jetty_base/webapps/zimbra; jar -xf ${repoDir}/zm-web-client/build/dist/jetty/webapps/zimbra.war )
@@ -362,7 +376,7 @@ main()
         "httpclient-4.5.2.jar"
         "httpcore-4.4.5.jar"
         "httpcore-nio-4.4.5.jar"
-	"httpmime-4.3.1.jar"
+        "httpmime-4.3.5.jar"
         "icu4j-4.8.1.1.jar"
         "jaxen-1.1.3.jar"
         "jcommon-1.0.21.jar"