diff --git a/packaging/pom.xml b/packaging/pom.xml
index 2a658afd9..033ddc78b 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -152,16 +152,16 @@
                                 <replace token= "\bin\solr.in.cmd" value="\..\solr.in.cmd" dir="target/solr-${solr.version}">
                                     <include name="**/bin/solr.cmd"/>
                                 </replace>
-                                <replace token= "# Set the thread stack size" value="${alfresco.search.config}${line.separator}${line.separator}# Set the thread stack size" dir="target/solr-${solr.version}">
                                 <replace token= "#SOLR_LOGS_DIR=logs" value="SOLR_LOGS_DIR=../../logs" dir="target/solr-${solr.version}">
                                     <include name="**/bin/solr.in.sh"/>
                                 </replace>
-                                <replace token= "REM Set the thread stack size" value="${alfresco.search.config.win}${line.separator}${line.separator}REM Set the thread stack size" dir="target/solr-${solr.version}">
                                 <replace token= "REM set SOLR_LOGS_DIR=logs" value="set SOLR_LOGS_DIR=..\..\logs" dir="target/solr-${solr.version}">
                                     <include name="**/bin/solr.in.cmd"/>
                                 </replace>
+                                <replace token= "# Anything you add to the SOLR_OPTS" value="${alfresco.search.config}${line.separator}${line.separator}# Anything you add to the SOLR_OPTS" dir="target/solr-${solr.version}">
                                     <include name="**/bin/solr.in.sh"/>
                                 </replace>
+                                <replace token= "REM Anything you add to the SOLR_OPTS" value="${alfresco.search.config.win}${line.separator}${line.separator}REM Anything you add to the SOLR_OPTS" dir="target/solr-${solr.version}">
                                     <include name="**/bin/solr.in.cmd"/>
                                 </replace>
                                 <replace token= "${alfresco.search.ssl.token}" value="${alfresco.search.ssl}${line.separator}  ${alfresco.search.ssl.token}" dir="target/solr-${solr.version}">