diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 6124d68527..0490fd86ec 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -1079,30 +1079,6 @@
         </property>
     </bean>
 
-    <bean id="solrHttpClientFactory" class="org.alfresco.httpclient.HttpClientFactory" init-method="init">
-        <property name="secureCommsType" value="${solr.secureComms}"/>
-        <property name="sSLEncryptionParameters" ref="sslEncryptionParameters"/>
-        <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
-        <property name="keyStoreParameters" ref="keyStoreParameters"/>
-        <property name="encryptionParameters" ref="md5EncryptionParameters"/>
-        <property name="host" value="${solr.host}"/>
-        <property name="port" value="${solr.port}"/>
-        <property name="sslPort" value="${solr.port.ssl}"/>
-        <property name="maxTotalConnections" value="${solr.max.total.connections}"/>
-        <property name="maxHostConnections" value="${solr.max.host.connections}"/>
-    </bean>
-
-    <bean id="solrAdminClient" class="org.alfresco.repo.solr.SOLRAdminClient" init-method="init" destroy-method="shutdown">
-      <property name="solrHost" value="${solr.host}"/>
-      <property name="solrPort" value="${solr.port}"/>
-      <property name="solrsslPort" value="${solr.port.ssl}"/>
-      <property name="solrUser" value="${solr.solrUser}"/>
-      <property name="solrPassword" value="${solr.solrPassword}"/>
-      <property name="solrPingCronExpression" value="${solr.solrPingCronExpression}"/>
-      <property name="solrConnectTimeout" value="${solr.solrConnectTimeout}"/>
-      <property name="httpClientFactory" ref="solrHttpClientFactory"/>
-    </bean>
-
     <bean id="solr" class="org.alfresco.repo.search.impl.solr.SolrChildApplicationContextFactory" parent="abstractPropertyBackedBean">
         <property name="autoStart">
             <value>false</value>
diff --git a/config/alfresco/subsystems/Search/solr/solr-search-context.xml b/config/alfresco/subsystems/Search/solr/solr-search-context.xml
index ee455da057..97dbdf554f 100644
--- a/config/alfresco/subsystems/Search/solr/solr-search-context.xml
+++ b/config/alfresco/subsystems/Search/solr/solr-search-context.xml
@@ -111,6 +111,34 @@
         </property>
     </bean>
     
+    <bean id="solrHttpClientFactory" class="org.alfresco.httpclient.HttpClientFactory" init-method="init">
+        <property name="secureCommsType" value="${solr.secureComms}"/>
+        <property name="sSLEncryptionParameters" ref="sslEncryptionParameters"/>
+        <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
+        <property name="keyStoreParameters" ref="keyStoreParameters"/>
+        <property name="encryptionParameters" ref="md5EncryptionParameters"/>
+        <property name="host" value="${solr.host}"/>
+        <property name="port" value="${solr.port}"/>
+        <property name="sslPort" value="${solr.port.ssl}"/>
+        <property name="maxTotalConnections" value="${solr.max.total.connections}"/>
+        <property name="maxHostConnections" value="${solr.max.host.connections}"/>
+    </bean>
+
+    <bean id="solrAdminClient" class="org.alfresco.repo.solr.SOLRAdminClient" init-method="init">
+      <property name="solrHost" value="${solr.host}"/>
+      <property name="solrPort" value="${solr.port}"/>
+      <property name="solrsslPort" value="${solr.port.ssl}"/>
+      <property name="solrUser" value="${solr.solrUser}"/>
+      <property name="solrPassword" value="${solr.solrPassword}"/>
+      <property name="solrPingCronExpression" value="${solr.solrPingCronExpression}"/>
+      <property name="solrConnectTimeout" value="${solr.solrConnectTimeout}"/>
+      <property name="httpClientFactory" ref="solrHttpClientFactory"/>
+       <property name="scheduler">
+            <ref bean="searchSchedulerFactory" />
+        </property>
+    </bean>
+    
+    
     <bean id="search.solrAdminHTTPCLient" class="org.alfresco.repo.search.impl.solr.SolrAdminHTTPClient" init-method="init">
         <property name="httpClientFactory" ref="solrHttpClientFactory"/>
     </bean>
diff --git a/source/java/org/alfresco/repo/solr/SOLRAdminClient.java b/source/java/org/alfresco/repo/solr/SOLRAdminClient.java
index f52192266a..9b32d25644 100644
--- a/source/java/org/alfresco/repo/solr/SOLRAdminClient.java
+++ b/source/java/org/alfresco/repo/solr/SOLRAdminClient.java
@@ -24,7 +24,6 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
@@ -46,7 +45,7 @@ import org.quartz.JobDetail;
 import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
 import org.quartz.Trigger;
-import org.quartz.impl.StdSchedulerFactory;
+import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 
@@ -57,7 +56,7 @@ import org.springframework.context.ApplicationEventPublisherAware;
  * @since 4.0
  *
  */
-public class SOLRAdminClient implements ApplicationEventPublisherAware
+public class SOLRAdminClient implements ApplicationEventPublisherAware, DisposableBean
 {
 	private String solrHost;
 	private int solrPort;
@@ -67,12 +66,13 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
 	private String solrPassword;
 	private String solrPingCronExpression;
 	private CommonsHttpSolrServer server;
-	private int solrConnectTimeout; // ms
+	private int solrConnectTimeout = 30000; // ms
 
 	private ApplicationEventPublisher applicationEventPublisher;
 	private SolrTracker solrTracker;
 	
 	private HttpClientFactory httpClientFactory;
+    private Scheduler scheduler;
 
 	public SOLRAdminClient()
 	{
@@ -123,8 +123,16 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
 	{
 		this.httpClientFactory = httpClientFactory;
 	}
+    
+	/**
+     * @param scheduler the scheduler to set
+     */
+    public void setScheduler(Scheduler scheduler)
+    {
+        this.scheduler = scheduler;
+    }
 
-	public void init()
+    public void init()
 	{
     	ParameterCheck.mandatory("solrHost", solrHost);
     	ParameterCheck.mandatory("solrPort", solrPort);
@@ -150,8 +158,9 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
 			server.getHttpClient().getState().setCredentials(new AuthScope(solrHost, solrPort, AuthScope.ANY_REALM), 
 					defaultcreds);
 			server.setConnectionTimeout(solrConnectTimeout);
+			server.setSoTimeout(20000);
 
-			this.solrTracker = new SolrTracker();
+			this.solrTracker = new SolrTracker(scheduler);
 		}
 		catch(MalformedURLException e)
 		{
@@ -159,11 +168,6 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
 		}
 	}
 
-    public void shutdown()
-    {
-    	this.solrTracker.shutdown();
-    }
-
 	public QueryResponse basicQuery(ModifiableSolrParams params)
 	{
     	try
@@ -217,8 +221,9 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
 
 	    private List<String> cores;
 
-		SolrTracker()
+		SolrTracker(Scheduler scheduler)
 		{
+		    this.scheduler = scheduler;
 	        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 	        writeLock = lock.writeLock();
 	        
@@ -306,19 +311,6 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
 	    {
 	    	try
 	    	{
-		        StdSchedulerFactory factory = new StdSchedulerFactory();
-		        Properties properties = new Properties();
-		        properties.setProperty("org.quartz.scheduler.instanceName", "SolrWatcherScheduler");
-		        properties.setProperty("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
-		        properties.setProperty("org.quartz.threadPool.threadCount", "3");
-		        properties.setProperty("org.quartz.threadPool.makeThreadsDaemons", "true");
-		        properties.setProperty("org.quartz.scheduler.makeSchedulerThreadDaemon", "true");
-		        properties.setProperty("org.quartz.jobStore.class", "org.quartz.simpl.RAMJobStore");
-		        factory.initialize(properties);
-		        scheduler = factory.getScheduler();
-		
-		        scheduler.start();
-		
                 final String jobName = "SolrWatcher";
                 final String jobGroup = "Solr";
                 
@@ -355,18 +347,6 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
 	    {
 	    	scheduler.pauseTrigger(trigger.getName(), trigger.getGroup());
 	    }
-	    
-	    void shutdown()
-	    {
-	    	try
-	    	{
-	    		scheduler.shutdown();
-	    	}
-	    	catch(SchedulerException e)
-	    	{
-	    		throw new AlfrescoRuntimeException("Unable to shut down Solr Tracker cleanly", e);
-	    	}
-	    }
 
 	    void registerCores(List<String> cores)
 	    {
@@ -396,4 +376,13 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
 	    }
 	}
 
+    /* (non-Javadoc)
+     * @see org.springframework.beans.factory.DisposableBean#destroy()
+     */
+    @Override
+    public void destroy() throws Exception
+    {
+        solrTracker.stopTimer();
+    }
+
 }