diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 0c50380804..ef59239827 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -293,14 +293,6 @@
        </property>
     </bean>
 
-
-
-    <!-- LinkValidationService -->
-    <bean id="linkValidationServiceBootstrap" 
-          class="org.alfresco.linkvalidation.LinkValidationServiceBootstrap">
-    </bean>
-    
-
     <!-- This component checks the interconnection between the metadata, indexes and content -->
     <bean id="configurationChecker" class="org.alfresco.repo.admin.ConfigurationChecker">
        <property name="strict">
@@ -345,6 +337,9 @@
         </property>
     </bean>
 
+    <!-- Import other Alfresco bootstrap components -->
+    <import resource="classpath*:alfresco/alfresco-*-bootstrap-context.xml" />
+
     <!-- Start module components -->
 
     <bean id="moduleStarter" class="org.alfresco.repo.module.ModuleStarter">