diff --git a/distribution/pom.xml b/distribution/pom.xml
index 58af8c81ac..ecbca66e2f 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-content-services-community-distribution</artifactId>
-            <version>${alfresco.platform.version}</version>
+            <version>${dependency.acs-community-packaging.version}</version>
             <type>zip</type>
             <exclusions>
                 <exclusion>
@@ -82,7 +82,7 @@
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-content-services-community-distribution</artifactId>
-                                    <version>${alfresco.platform.version}</version>
+                                    <version>${dependency.acs-community-packaging.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
                                 <artifactItem>
diff --git a/distribution/src/assembly/full-distribution.xml b/distribution/src/assembly/full-distribution.xml
index 736b953103..e7c2220e27 100644
--- a/distribution/src/assembly/full-distribution.xml
+++ b/distribution/src/assembly/full-distribution.xml
@@ -17,13 +17,13 @@
 
         <!-- Platform Community Distribution -->
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${alfresco.platform.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${dependency.acs-community-packaging.version}</directory>
             <outputDirectory/>
         </fileSet>
 
         <!-- Platform Enterprise Distribution -->
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-distribution-${alfresco.platform.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-distribution-${dependency.acs-packaging.version}</directory>
             <outputDirectory/>
         </fileSet>
 
diff --git a/distribution/src/main/resources/README.txt b/distribution/src/main/resources/README.txt
index 820973291d..63104fc294 100644
--- a/distribution/src/main/resources/README.txt
+++ b/distribution/src/main/resources/README.txt
@@ -2,7 +2,7 @@ Alfresco Community (Build: ${installer.version.name})
 ===============================
 
 Contains:
-	- Alfresco Content Services Community:	${alfresco.platform.version}
+	- Alfresco Content Services Community:	${dependency.acs-community-packaging.version}
 	- Alfresco Share:		${alfresco.share.version}
 
 For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm
diff --git a/ear/pom.xml b/ear/pom.xml
index c8d1407a96..db01551f1b 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -9,19 +9,6 @@
     </parent>
     <packaging>pom</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- Import all dependencyManagement from Alfresco Platform -->
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-parent</artifactId>
-                <version>${alfresco.platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <!-- WARs to include in the EAR -->
         <dependency>
@@ -39,7 +26,6 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-server-root</artifactId>
-            <version>${alfresco.platform.version}</version>
             <type>war</type>
         </dependency>
         <dependency>
@@ -230,7 +216,7 @@
                         <configuration>
                             <includeArtifactIds>alfresco-content-services-full-distribution</includeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
-                            <excludes>alfresco-content-services-full-distribution-${alfresco.platform.version}/solr4/,alfresco-content-services-full-distribution-${alfresco.platform.version}/web-server/webapps/,alfresco-content-services-full-distribution-${alfresco.platform.version}/modules/</excludes>
+                            <excludes>alfresco-content-services-full-distribution-${dependency.acs-packaging.version}/solr4/,alfresco-content-services-full-distribution-${dependency.acs-packaging.version}/web-server/webapps/,alfresco-content-services-full-distribution-${dependency.acs-packaging.version}/modules/</excludes>
                         </configuration>
                     </execution>
 
@@ -262,7 +248,7 @@
                                     <version>1.0.1</version>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${alfresco.platform.version}/web-server/lib</outputDirectory>
+                            <outputDirectory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${dependency.acs-packaging.version}/web-server/lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/ear/src/assembly/ear-distribution.xml b/ear/src/assembly/ear-distribution.xml
index 0f3629d4b7..a7a3349f46 100644
--- a/ear/src/assembly/ear-distribution.xml
+++ b/ear/src/assembly/ear-distribution.xml
@@ -8,14 +8,14 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${alfresco.platform.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${dependency.acs-packaging.version}</directory>
             <outputDirectory/>
             <excludes>
                 <exclude>web-server/shared/**</exclude>
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${alfresco.platform.version}/web-server/shared/classes</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${dependency.acs-packaging.version}/web-server/shared/classes</directory>
             <outputDirectory>web-server/classpath</outputDirectory>
         </fileSet>
         <fileSet>
diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml
index 4fd8b6745f..b029efb9db 100644
--- a/enterprise-distribution/pom.xml
+++ b/enterprise-distribution/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-content-services-distribution</artifactId>
-            <version>${alfresco.platform.version}</version>
+            <version>${dependency.acs-packaging.version}</version>
             <type>zip</type>
             <exclusions>
                 <exclusion>
@@ -81,7 +81,7 @@
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-content-services-distribution</artifactId>
-                                    <version>${alfresco.platform.version}</version>
+                                    <version>${dependency.acs-packaging.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
                                 <artifactItem>
diff --git a/enterprise-distribution/src/main/resources/README.txt b/enterprise-distribution/src/main/resources/README.txt
index 66e5741715..2bfc9a0f2b 100644
--- a/enterprise-distribution/src/main/resources/README.txt
+++ b/enterprise-distribution/src/main/resources/README.txt
@@ -2,7 +2,7 @@ Alfresco Content Services (Build: ${installer.version.name})
 ==============================================
 
 Contains:
-	- Alfresco Content Services Platform:	${alfresco.platform.version}
-	- Alfresco Content Services Share:		${alfresco.share.version}
+	- Alfresco Content Services:	${dependency.acs-packaging.version}
+	- Alfresco Share:		${alfresco.share.version}
 
 See the Alfresco Support Portal (http://support.alfresco.com) for release notes and detailed information on this release.
diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml
index 9e83c72beb..12ac4d8ec9 100644
--- a/enterprise-war-for-ear/pom.xml
+++ b/enterprise-war-for-ear/pom.xml
@@ -13,7 +13,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>content-services</artifactId>
-            <version>${alfresco.platform.version}</version>
+            <version>${dependency.acs-packaging.version}</version>
             <type>war</type>
         </dependency>
         <dependency>
diff --git a/installer/pom.xml b/installer/pom.xml
index 41314cf846..924558bb8f 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -272,14 +272,6 @@
                                     <version>${alfresco.googledocs.version}</version>
                                     <type>amp</type>
                                 </artifactItem>
-                                <!-- Alfresco SPP -->
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-spp</artifactId>
-                                    <version>${alfresco.platform.version}</version>
-                                    <type>amp</type>
-                                    <destFileName>alfresco-spp.amp</destFileName>
-                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index 7408995826..105473093c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,8 +12,11 @@
     <name>Alfresco Full Installation</name>
 
     <properties>
-        <!-- Alfresco Platform version -->
-        <alfresco.platform.version>5.3-SNAPSHOT</alfresco.platform.version>
+        <!-- Community Packaging version -->
+        <dependency.acs-community-packaging.version>6.0.a-SNAPSHOT</dependency.acs-community-packaging.version>
+
+        <!-- Enterprise Packaging version -->
+        <dependency.acs-packaging.version>6.0.0-SNAPSHOT</dependency.acs-packaging.version>
 
         <!-- Alfresco Share version -->
         <alfresco.share.version>5.2.2-SNAPSHOT</alfresco.share.version>
@@ -74,6 +77,19 @@
         <module>share-po-run</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <!-- Import Enterprise packaging dependency management -->
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>acs-packaging</artifactId>
+                <version>${dependency.acs-packaging.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <profiles>
         <profile>
             <id>community</id>
diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml
index 1f2762229b..72f7d9fccc 100644
--- a/public-javadoc/pom.xml
+++ b/public-javadoc/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-remote-api</artifactId>
-            <version>${alfresco.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>