diff --git a/config/alfresco/keystore/generate_keystores.bat b/config/alfresco/keystore/generate_keystores.bat
index 85deeddb11..e78c609712 100755
--- a/config/alfresco/keystore/generate_keystores.bat
+++ b/config/alfresco/keystore/generate_keystores.bat
@@ -51,8 +51,8 @@ copy /Y "%CERTIFICATE_HOME%\browser.p12" "%ALFRESCO_KEYSTORE_HOME%\browser.p12"
 
 @echo ****************************************
 @echo You must copy the following files to the correct location.
-@echo %ALFRESCO_KEYSTORE_HOME%\ssl.keystore
-@echo %ALFRESCO_KEYSTORE_HOME%\ssl.truststore
+@echo %CERTIFICATE_HOME%\ssl.repo.client.keystore
+@echo %CERTIFICATE_HOME%\ssl.repo.client.truststore
 @echo eg. for Solr 4 the location is SOLR_HOME\workspace-SpacesStore\conf and SOLR_HOME\archive-SpacesStore\conf  
 @echo Please ensure that you set dir.keystore=%ALFRESCO_KEYSTORE_HOME% in alfresco-global.properties
 @echo ****************************************
\ No newline at end of file
diff --git a/config/alfresco/keystore/generate_keystores.sh b/config/alfresco/keystore/generate_keystores.sh
index d9483224f7..79c1200a7a 100755
--- a/config/alfresco/keystore/generate_keystores.sh
+++ b/config/alfresco/keystore/generate_keystores.sh
@@ -73,8 +73,8 @@ echo " "
 echo "*******************************************"
 echo "You must sure copy the following files to the correct location."
 echo " "
-echo " $ALFRESCO_KEYSTORE_HOME/ssl.keystore"
-echo " $ALFRESCO_KEYSTORE_HOME/ssl.truststore"
+echo " $CERTIFICATE_HOME/ssl.repo.client.keystore"
+echo " $CERTIFICATE_HOME/ssl.repo.client.truststore"
 echo " eg. for Solr 4 the location is SOLR_HOME/workspace-SpacesStore/conf/ and SOLR_HOME/archive-SpacesStore/conf/"
 echo " "
 echo "$ALFRESCO_KEYSTORE_HOME/browser.p12 has also been generated."