diff --git a/src/main/resources/bitrock/alfresco-solr4.xml b/src/main/resources/bitrock/alfresco-solr4.xml
index ae77b72c08..9afb0bdf35 100644
--- a/src/main/resources/bitrock/alfresco-solr4.xml
+++ b/src/main/resources/bitrock/alfresco-solr4.xml
@@ -5,6 +5,21 @@
     <selected>1</selected>
     <show>1</show>
     <folderList>
+      <folder>
+          <description>//War Files</description>
+          <name>solr4warfile</name>
+          <destination>${installdiralfresco}</destination>
+          <distributionFileList>
+              <distributionFile origin="${alfresco_war_source_directory}/solr4.war" />
+          </distributionFileList>
+      </folder>
+
+      <folder>
+          <description>//alf_data</description>
+          <name>solr4alfdata</name>
+          <destination>${alfresco_data_directory}/solr4</destination>
+      </folder>
+
       <folder>
           <name>solr4</name>
           <destination>${installdir}/solr4</destination>
@@ -68,4 +83,7 @@
           </substitutionList>
       </substitute>
     </postInstallationActionList>
+    <postUninstallationActionList>
+        <deleteFile path="${alfresco_data_directory}/solr4" />
+    </postUninstallationActionList>
 </component>
diff --git a/src/main/resources/bitrock/alfrescodm.xml b/src/main/resources/bitrock/alfrescodm.xml
index a7ff5c7e05..06ece06985 100644
--- a/src/main/resources/bitrock/alfrescodm.xml
+++ b/src/main/resources/bitrock/alfrescodm.xml
@@ -127,7 +127,8 @@
                 <deleteFile path="${alfresco_library_directory}/mysql-connector-java-*.jar"/>
             </actionList>
             <distributionFileList>
-                <distributionFile origin="${alfresco_war_source_directory}/*.war" allowWildcards="1"/>
+                <distributionFile origin="${alfresco_war_source_directory}/alfresco.war" />
+                <distributionFile origin="${alfresco_war_source_directory}/share.war" />
             </distributionFileList>
         </folder>
         <folder>