diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml
index c81accee3c..93b3f13c58 100644
--- a/config/alfresco/application-context.xml
+++ b/config/alfresco/application-context.xml
@@ -29,6 +29,7 @@
     <import resource="classpath:alfresco/avm-services-context.xml" />
     <import resource="classpath:alfresco/audit-services-context.xml" />
     <import resource="classpath:alfresco/attributes-service-context.xml"/>
+    <import resource="classpath:alfresco/linkvalidation-service-context.xml"/>
     <import resource="classpath:alfresco/remote-services-context.xml"/>
     <import resource="classpath*:alfresco/patch/*-context.xml" />
     <import resource="classpath*:alfresco/domain/*-context.xml" />
diff --git a/config/alfresco/linkvalidation-service-context.xml b/config/alfresco/linkvalidation-service-context.xml
new file mode 100644
index 0000000000..14e47f8178
--- /dev/null
+++ b/config/alfresco/linkvalidation-service-context.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING/DTD BEAN//EN"
+	"http://www.springframework.org/dtd/spring-beans.dtd">
+	
+<beans>
+    <bean id="linkValidationService" 
+          class="org.alfresco.linkvalidation.LinkValidationServiceImpl">
+        <property name="attributeService">
+            <ref bean="attributeService"/>
+        </property>
+        <property name="avmRemote">
+            <ref bean="avmRemote"/>
+        </property>
+        <property name="virtServerRegistry">
+            <ref bean="VirtServerRegistry"/>
+        </property>
+    </bean>
+</beans>
diff --git a/config/alfresco/public-services-context.xml b/config/alfresco/public-services-context.xml
index bc77fc0515..cd9a51be6a 100644
--- a/config/alfresco/public-services-context.xml
+++ b/config/alfresco/public-services-context.xml
@@ -869,12 +869,11 @@
             <list>
                 <value>avmServiceWriteTxnAdvisor</value>
                 <value>avmServiceReadTxnAdvisor</value>
-				<value>avmSnapShotTriggeredIndexingMethodInterceptor</value>
+                <value>avmSnapShotTriggeredIndexingMethodInterceptor</value>
             </list>
         </property>
     </bean>
-    
-	 <bean id="indexingAVMService" class="org.springframework.aop.framework.ProxyFactoryBean">
+    <bean id="indexingAVMService" class="org.springframework.aop.framework.ProxyFactoryBean">
         <property name="proxyInterfaces">
             <list>
                 <value>org.alfresco.service.cmr.avm.AVMService</value>
@@ -885,23 +884,23 @@
         </property>
         <property name="interceptorNames">
             <list>
-				<value>avmSnapShotTriggeredIndexingMethodInterceptor</value>
+                <value>avmSnapShotTriggeredIndexingMethodInterceptor</value>
             </list>
         </property>
     </bean>
-	
-	<bean id="avmSnapShotTriggeredIndexingMethodInterceptor" class="org.alfresco.repo.search.AVMSnapShotTriggeredIndexingMethodInterceptor">
-		<property name="avmService">
-			<ref bean="avmService" />
-		</property>
-		<property name="indexerAndSearcher">
-			<ref bean="avmLuceneIndexerAndSearcherFactory" />
-		</property>
-		<property name="enableIndexing">
-			<value>true</value>
-		</property>
-	</bean>
-	
+    
+    <bean id="avmSnapShotTriggeredIndexingMethodInterceptor" class="org.alfresco.repo.search.AVMSnapShotTriggeredIndexingMethodInterceptor">
+        <property name="avmService">
+            <ref bean="avmService" />
+        </property>
+        <property name="indexerAndSearcher">
+            <ref bean="avmLuceneIndexerAndSearcherFactory" />
+        </property>
+        <property name="enableIndexing">
+            <value>true</value>
+        </property>
+    </bean>
+    
     <!-- The AVMSyncService -->
     
     <bean id="avmSyncService" class="org.alfresco.repo.avm.AVMSyncServiceImpl">
@@ -968,8 +967,8 @@
                 <value>getAttributes</value>
                 <value>query</value>
                 <value>getKeys</value>
-            	<value>exists</value>
-            	<value>getCount</value>
+                <value>exists</value>
+                <value>getCount</value>
             </list>
         </property>
     </bean>
@@ -1024,19 +1023,19 @@
             </list>
         </property>
     </bean>
-	-->
-	
-	<bean id="deploymentServiceWriteTxnAdvisor" class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
-	    <property name="advice">
-	        <ref bean="retryingWriteTxnAdvice"/>
-	    </property>
-	    <property name="mappedNames">
-	        <list>
-	            <value>deployDifferenceFS</value>
-	            <value>deployDifference</value>
-	        </list>
-	    </property>
-	</bean>
+    -->
+    
+    <bean id="deploymentServiceWriteTxnAdvisor" class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
+        <property name="advice">
+            <ref bean="retryingWriteTxnAdvice"/>
+        </property>
+        <property name="mappedNames">
+            <list>
+                <value>deployDifferenceFS</value>
+                <value>deployDifference</value>
+            </list>
+        </property>
+    </bean>
 
     <bean id="DeploymentService" class="org.springframework.aop.framework.ProxyFactoryBean">
         <property name="proxyInterfaces">
@@ -1278,4 +1277,62 @@
         </property>
     </bean>
     
-</beans>
\ No newline at end of file
+
+
+
+    <!-- LinkValidationService -->
+    <!-- Read transaction advisor for link validation service. -->
+    <bean id="linkValidationServiceReadTxnAdvisor" 
+          class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
+        <property name="advice">
+            <ref bean="retryingReadTxnAdvice"/>
+        </property>
+        <property name="mappedNames">
+            <list>
+                <!-- Takes a value to a collection of webapps -->
+                <!-- (e.g.:   mysite:/www/avm_webapps)        -->
+                <!-- or a specific webapp within a store      -->
+                <!-- (e.g.:   mysite:/www/avm_webapps/ROOT)   -->
+                <value>getBrokenHrefs</value>
+            </list>
+        </property>
+    </bean>
+    
+    <!-- Write transaction advisor for link validation service. -->
+    <bean id="linkValidationServiceWriteTxnAdvisor" 
+          class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
+        <property name="advice">
+            <ref bean="retryingWriteTxnAdvice"/>
+        </property>
+        <property name="mappedNames">
+            <list>
+                <!-- Takes a value to a collection of webapps -->
+                <!-- (e.g.:   mysite:/www/avm_webapps)        -->
+                <!-- or a specific webapp within a store      -->
+                <!-- (e.g.:   mysite:/www/avm_webapps/ROOT)   -->
+
+                <value>updateHrefInfo</value>
+
+            </list>
+        </property>
+    </bean>
+
+    <bean id="LinkValidationService" 
+          class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <list>
+                <value>org.alfresco.linkvalidation.LinkValidationService</value>
+            </list>
+        </property>
+        <property name="targetName">
+            <value>linkValidationService</value>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <value>linkValidationServiceWriteTxnAdvisor</value>
+                <value>linkValidationServiceReadTxnAdvisor</value>
+            </list>
+        </property>
+    </bean>
+
+</beans>