diff --git a/config/alfresco/bootstrap/spaces.xml b/config/alfresco/bootstrap/spaces.xml
index ed90644478..77c6bb8d08 100644
--- a/config/alfresco/bootstrap/spaces.xml
+++ b/config/alfresco/bootstrap/spaces.xml
@@ -17,6 +17,9 @@
 		<app:icon>space-icon-default</app:icon>
 		<cm:title>${spaces.company_home.name}</cm:title>
 		<cm:description>${spaces.company_home.description}</cm:description>
+                <view:aspects>
+                   <cm:tagscope/>
+                </view:aspects>
 		<cm:contains>
 			<cm:folder view:childName="${spaces.dictionary.childname}">
             <view:acl view:inherit="false">
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index f412fafc56..b9acfe9751 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -456,4 +456,7 @@ patch.genericBootstrap.result.deferred=The patch has been deferred
 patch.asynchrounse.checking=Checking for the asynchronous patch ...
 
 patch.renameSiteAuthorityDisplayName.description=Update authority display name for sites
-patch.renameSiteAuthorityDisplayName.result=Updating of display names was completed
\ No newline at end of file
+patch.renameSiteAuthorityDisplayName.result=Updating of display names was completed
+
+patch.addTagScopeAspect.description=Add tagscode aspect to the Company Home folder
+patch.addTagScopeAspect.result=tagscope aspect added to the Company Home folder successfully
\ No newline at end of file
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 71782e7793..083ee2997f 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -3205,6 +3205,32 @@
         </property>
     </bean>
     
+    <bean id="patch.addTagScopeAspect"
+        class="org.alfresco.repo.admin.patch.impl.AddTagScopeAspect"
+        parent="basePatch">
+        <property name="id">
+            <value>patch.addTagScopeAspect</value>
+        </property>
+        <property name="description">
+            <value>patch.addTagScopeAspect.description</value>
+        </property>
+        <property name="fixesFromSchema">
+            <value>0</value>
+        </property>
+        <property name="fixesToSchema">
+            <value>6065</value>
+        </property>
+        <property name="targetSchema">
+            <value>6066</value>
+        </property>
+        <property name="repository">
+            <ref bean="repositoryHelper"/>
+        </property>
+        <property name="taggingService">
+            <ref bean="TaggingService"/>
+        </property>
+    </bean>
+    
     <bean id="patch.siteAdministrators" class="org.alfresco.repo.admin.patch.impl.AddGroupAuthorityPatch" parent="basePatch" >
         <property name="id"><value>patch.siteAdministrators</value></property>
         <property name="description"><value>patch.siteAdministrators.description</value></property>
@@ -3295,6 +3321,7 @@
         <!--  Do we deferr running the surf-config folder patch? -->
         <property name="deferred"><value>${system.patch.surfConfigFolder.deferred}</value></property>
     </bean> 
+
     <bean id="patch.renameSiteAuthorityDisplayName"
         class="org.alfresco.repo.admin.patch.impl.RenameSiteAuthorityDisplayName"
         parent="basePatch">
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AddTagScopeAspect.java b/source/java/org/alfresco/repo/admin/patch/impl/AddTagScopeAspect.java
new file mode 100644
index 0000000000..5ad83de9ff
--- /dev/null
+++ b/source/java/org/alfresco/repo/admin/patch/impl/AddTagScopeAspect.java
@@ -0,0 +1,45 @@
+package org.alfresco.repo.admin.patch.impl;
+
+import org.alfresco.repo.admin.patch.AbstractPatch;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.service.cmr.tagging.TaggingService;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+public class AddTagScopeAspect  extends AbstractPatch
+{
+    /** The title we give to the batch process in progress messages / JMX. */
+    private static final String SUCCESS_MSG = "patch.addTagScopeAspect.result";
+    
+    /** Services */
+    private TaggingService taggingService;
+    
+    /** Repository object */
+    private Repository repository;
+
+    
+    /**
+     * Sets the tagging service.
+     * 
+     * @param taggingService
+     *            the tagging service
+     */
+    public void setTaggingService(TaggingService taggingService)
+    {
+        this.taggingService = taggingService;
+    }
+    
+    /**
+     * @param repository    repository object
+     */
+    public void setRepository(Repository repository)
+    {
+        this.repository = repository;
+    }
+
+    @Override
+    protected String applyInternal() throws Exception
+    {
+        taggingService.addTagScope(repository.getCompanyHome());
+        return I18NUtil.getMessage(SUCCESS_MSG);
+    }
+}
\ No newline at end of file