diff --git a/src/Umbraco.Web.UI/config/ExamineIndex.Release.config b/src/Umbraco.Web.UI/config/ExamineIndex.Release.config
index c95f24d1e2..b56a5a19e8 100644
--- a/src/Umbraco.Web.UI/config/ExamineIndex.Release.config
+++ b/src/Umbraco.Web.UI/config/ExamineIndex.Release.config
@@ -8,10 +8,10 @@ More information and documentation can be found on CodePlex: http://umbracoexami
 -->
 <ExamineLuceneIndexSets>
   <!-- The internal index set used by Umbraco back-office - DO NOT REMOVE -->
-  <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Internal/"/>
+  <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/Internal/"/>
 
   <!-- The internal index set used by Umbraco back-office for indexing members - DO NOT REMOVE -->
-  <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/">
+  <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/InternalMember/">
     <IndexAttributeFields>
       <add Name="id" />
       <add Name="nodeName"/>
@@ -24,5 +24,5 @@ More information and documentation can be found on CodePlex: http://umbracoexami
   </IndexSet>
     
   <!-- Default Indexset for external searches, this indexes all fields on all types of nodes-->
-  <IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/External/" />
+  <IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/External/" />
 </ExamineLuceneIndexSets>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/ExamineIndex.config b/src/Umbraco.Web.UI/config/ExamineIndex.config
index a853847ecb..7212053ca0 100644
--- a/src/Umbraco.Web.UI/config/ExamineIndex.config
+++ b/src/Umbraco.Web.UI/config/ExamineIndex.config
@@ -9,10 +9,10 @@ More information and documentation can be found on CodePlex: http://umbracoexami
 <ExamineLuceneIndexSets>
   
   <!-- The internal index set used by Umbraco back-office - DO NOT REMOVE -->
-  <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Internal/" />
+  <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/Internal/" />
 
   <!-- The internal index set used by Umbraco back-office for indexing members - DO NOT REMOVE -->
-  <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/">
+  <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/InternalMember/">
     <IndexAttributeFields>
       <add Name="id" />
       <add Name="nodeName"/>
@@ -25,6 +25,6 @@ More information and documentation can be found on CodePlex: http://umbracoexami
   </IndexSet>
   
   <!-- Default Indexset for external searches, this indexes all fields on all types of nodes-->
-  <IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/External/" />
+  <IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/External/" />
   
 </ExamineLuceneIndexSets>
\ No newline at end of file