diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr-config/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr-config/pom.xml
index 8a2eb457..530d1a6b 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr-config/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr-config/pom.xml
@@ -69,6 +69,30 @@
                         </executions>
                     </plugin>
 
+                    <!-- For windows paths, convert single \ to / for the ${alfresco.solr.data.dir} path,
+                         by default it will be c:\bla\, we need forward slash or double backslash. -->
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>regexp-property</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>regex-property</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <name>solrDataDir</name>
+                            <value>${alfresco.solr.data.dir}</value>
+                            <regex>\\</regex>
+                            <replacement>/</replacement>
+                            <failIfNoMatch>false</failIfNoMatch>
+                        </configuration>
+                    </plugin>
+
+
                     <!-- Run the goal replace and update configuration files for the
                          Solr cores to reflect our build structure -->
                     <plugin>
@@ -90,21 +114,9 @@
                                 <include>${alfresco.solr.home.dir}/workspace-SpacesStore/conf/solrcore.properties</include>
                             </includes>
                             <replacements>
-                                <replacement>
-                                    <token>@@ALFRESCO_SOLR4_DIR@@</token>
-                                    <value>${alfresco.solr.home.dir}/</value>
-                                </replacement>
-                                <replacement>
-                                    <token>@@ALFRESCO_SOLR4_MODEL_DIR@@</token>
-                                    <value>${alfresco.solr.home.dir}/alfrescoModels/</value>
-                                </replacement>
-                                <replacement>
-                                    <token>@@ALFRESCO_SOLR4_CONTENT_DIR@@</token>
-                                    <value>${alfresco.solr.data.dir}/content/</value>
-                                </replacement>
                                 <replacement>
                                     <token>@@ALFRESCO_SOLR4_DATA_DIR@@</token>
-                                    <value>${alfresco.solr.data.dir}/index</value>
+                                    <value>${solrDataDir}/index</value>
                                 </replacement>
                             </replacements>
                         </configuration>