diff --git a/alfresco-solr/pom.xml b/alfresco-solr/pom.xml
index 7f0537c3a..8a37a0406 100644
--- a/alfresco-solr/pom.xml
+++ b/alfresco-solr/pom.xml
@@ -9,30 +9,17 @@
     <name>Alfresco Solr 6</name>
     <version>1.0-SNAPSHOT</version>
     <packaging>war</packaging>
-
-    <repositories>
-        <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-   <!--  <parent>
+    <parent>
         <groupId>org.alfresco</groupId>
-        <artifactId>alfresco-super-pom</artifactId>
-        <version>6</version>
+        <artifactId>alfresco-solr-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
- -->
     <properties>
         <maven.tomcat.path>/solr6</maven.tomcat.path>
         <m2eclipse.wtp.contextRoot>${maven.tomcat.path}</m2eclipse.wtp.contextRoot>
         <maven.tomcat.port>${tomcat.default.solr6.port}</maven.tomcat.port>
         <maven.tomcat.httpsPort>${tomcat.default.solr6.ssl.port}</maven.tomcat.httpsPort>
-        <solr.version>6.0.0</solr.version>
         <solr.instance.source.folder>src/main/resources/solr/instance</solr.instance.source.folder>
         <!-- This gets filtered in the solr-tomcat-context.xml and in solrcore.properties when running embedded -->
         <solr.ssl.instance.target.folder>${project.build.directory}/solr-instance-ssl</solr.ssl.instance.target.folder>
@@ -53,11 +40,11 @@
             <version>${solr.version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-solrclient</artifactId>
-            <version>5.1-K_2-SNAPSHOT</version>
+            <version>${alfresco-solr.version}</version>
         </dependency>
 
 
@@ -362,7 +349,7 @@
                 </executions>
             </plugin>
         -->
-        </plugins> 
+        </plugins>
     </build>
 
     <profiles>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index d3ad38e98..481c28649 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -2,19 +2,18 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alfresco</groupId>
     <artifactId>alfresco-solr</artifactId>
-    <version>5.1-K_2-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
     <name>Alfresco Solr Distribution</name>
     <description>Produces the solr distribution zip</description>
     <properties>
-      <solr.version>6.0.1</solr.version>
-      <alfresco-solr.version>${project.version}</alfresco-solr.version>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
     <parent>
-      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-super-pom</artifactId>
-      <version>6</version>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-solr-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <dependencies>
       <dependency>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..dfd7153cd
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-super-pom</artifactId>
+        <version>6</version>
+    </parent>
+    <artifactId>alfresco-solr-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Alfresco Solr parent</name>
+
+    <properties>
+        <solr.version>6.0.1</solr.version>
+        <alfresco-solr.version>5.1-K_2-SNAPSHOT</alfresco-solr.version>        
+    </properties>
+
+    <modules>
+      <module>alfresco-solr</module>
+      <module>packaging</module>
+    </modules>
+</project>