diff --git a/search-services/packaging/config.properties b/search-services/packaging/config.properties
index 32fd410d3..7742233c5 100644
--- a/search-services/packaging/config.properties
+++ b/search-services/packaging/config.properties
@@ -4,4 +4,6 @@ alfresco.solr.config=# Alfresco configuration. This file is automatically includ
 ${line.separator}SOLR_OPTS="$SOLR_OPTS -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000"
 alfresco.solr.config.win=REM Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
 ${line.separator}set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000
-alfresco.solr.ssl.token=  <Set name="excludeProtocols">
\ No newline at end of file
+alfresco.solr.ssl.token=  <Set name="excludeProtocols">
+alfresco.solr.ssl.need=<Set name="NeedClientAuth"><Property name="solr.jetty.ssl.needclientauth" default="true"/></Set>
+alfresco.solr.ssl.need.token=<Set name="NeedClientAuth"><Property name="solr.jetty.ssl.needClientAuth" default="false"/></Set>
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index 63dd31b7f..f5272a4fd 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -161,6 +161,9 @@
                                 <replace token= "${alfresco.solr.ssl.token}" value="${alfresco.solr.ssl}${line.separator}  ${alfresco.solr.ssl.token}" dir="target/solr-${solr.version}">
                                     <include name="**/server/etc/jetty*.xml"/>
                                 </replace>
+                                <replace token= "${alfresco.solr.ssl.need.token}" value="${alfresco.solr.ssl.need}" dir="target/solr-${solr.version}">
+                                    <include name="**/server/etc/jetty-ssl.xml"/>
+                                </replace>
                                 <chmod file="target/solr-${solr.version}/bin/solr" perm="755"/>
                             </target>
                         </configuration>