diff --git a/README b/README
index a4bcb61f..85c1fb72 100644
--- a/README
+++ b/README
@@ -22,28 +22,35 @@ How to Use
           <dependency>
               <groupId>android</groupId>
               <artifactId>android</artifactId>
-              <version>1.1</version>
+              <version>1.1_r1</version>
               <scope>provided</scope>
           </dependency>
 
           <dependency>
               <groupId>android</groupId>
               <artifactId>android</artifactId>
-              <version>1.5</version>
+              <version>1.5_r3</version>
               <scope>provided</scope>
           </dependency>
 
           <dependency>
               <groupId>android</groupId>
               <artifactId>android</artifactId>
-              <version>1.6</version>
+              <version>1.6_r2</version>
               <scope>provided</scope>
           </dependency>
 
           <dependency>
               <groupId>android</groupId>
               <artifactId>android</artifactId>
-              <version>2.0</version>
+              <version>2.0_r1</version>
+              <scope>provided</scope>
+          </dependency>
+
+          <dependency>
+              <groupId>android</groupId>
+              <artifactId>android</artifactId>
+              <version>2.0.1_r1</version>
               <scope>provided</scope>
           </dependency>
 
@@ -52,24 +59,30 @@ How to Use
           <dependency>
               <groupId>com.google.android.maps</groupId>
               <artifactId>maps</artifactId>
-              <version>3-r03</version>
+              <version>3_r3</version>
               <scope>provided</scope>
           </dependency>
 
           <dependency>
               <groupId>com.google.android.maps</groupId>
               <artifactId>maps</artifactId>
-              <version>4-r01</version>
+              <version>4_r1</version>
               <scope>provided</scope>
           </dependency>
 
           <dependency>
               <groupId>com.google.android.maps</groupId>
               <artifactId>maps</artifactId>
-              <version>5-r01</version>
+              <version>5_r1</version>
               <scope>provided</scope>
           </dependency>
 
+          <dependency>
+              <groupId>com.google.android.maps</groupId>
+              <artifactId>maps</artifactId>
+              <version>6_r1</version>
+              <scope>provided</scope>
+          </dependency>
 
 How To Use for Deploying Onto Remote Server
 -------------------------------------------
@@ -104,8 +117,6 @@ For more information about this stuff look at the documentation for the maven-de
 Potential todo items
 --------------------
 
-- configure clean plugin calls to delete files in local repository, if deemed useful by users
-
 - add automatic download and install of SDK into .m2/repository somewhere, could then use dependency plugin to
   pull into target and use from there, problem SDK license agreement 
 
diff --git a/add-ons/google-apis-3-r03/pom.xml b/add-ons/google-apis-3-r03/pom.xml
index b3e9bdd2..a63a31c6 100644
--- a/add-ons/google-apis-3-r03/pom.xml
+++ b/add-ons/google-apis-3-r03/pom.xml
@@ -13,8 +13,8 @@
     </parent>
 
     <properties>
-        <jar.path>${sdk.addons.path}/google_apis-3-r03/libs/maps.jar</jar.path>
-        <jar.version>3-r03</jar.version>
+        <jar.simpleVersion>3</jar.simpleVersion>
+        <addon.directory>google_apis-3-r03</addon.directory>
     </properties>
 
     <build>
@@ -43,8 +43,8 @@
                         <phase>deploy</phase>
                         <goals><goal>deploy-file</goal></goals>
                         <configuration>
-                            <groupId>${platform.android.groupid}</groupId>
-                            <artifactId>${platform.android.artifactid}</artifactId>
+                            <groupId>${addon.googlemaps.groupid}</groupId>
+                            <artifactId>${addon.googlemaps.artifactid}</artifactId>
                             <packaging>jar</packaging>
                             <version>${jar.version}</version>
                             <file>${jar.path}</file>
@@ -54,6 +54,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/add-ons/google-apis-4-r01/pom.xml b/add-ons/google-apis-4-r01/pom.xml
index 7eade13f..49729512 100644
--- a/add-ons/google-apis-4-r01/pom.xml
+++ b/add-ons/google-apis-4-r01/pom.xml
@@ -13,8 +13,8 @@
     </parent>
 
     <properties>
-        <jar.path>${sdk.addons.path}/google_apis-4-r01/libs/maps.jar</jar.path>
-        <jar.version>4-r01</jar.version>
+        <jar.simpleVersion>4</jar.simpleVersion>
+        <addon.directory>google_apis-4-r01</addon.directory>
     </properties>
 
     <build>
@@ -43,8 +43,8 @@
                         <phase>deploy</phase>
                         <goals><goal>deploy-file</goal></goals>
                         <configuration>
-                            <groupId>${platform.android.groupid}</groupId>
-                            <artifactId>${platform.android.artifactid}</artifactId>
+                            <groupId>${addon.googlemaps.groupid}</groupId>
+                            <artifactId>${addon.googlemaps.artifactid}</artifactId>
                             <packaging>jar</packaging>
                             <version>${jar.version}</version>
                             <file>${jar.path}</file>
@@ -54,6 +54,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/add-ons/google-apis-5-r01/pom.xml b/add-ons/google-apis-5-r01/pom.xml
index e4864f5b..592b2fc3 100644
--- a/add-ons/google-apis-5-r01/pom.xml
+++ b/add-ons/google-apis-5-r01/pom.xml
@@ -13,9 +13,9 @@
     </parent>
 
     <properties>
+        <jar.simpleVersion>5</jar.simpleVersion>
         <!-- careful, path has underscore as nice inconsistency -->
-        <jar.path>${sdk.addons.path}/google_apis-5_r01/libs/maps.jar</jar.path>
-        <jar.version>5-r01</jar.version>
+        <addon.directory>google_apis-5_r01</addon.directory>
     </properties>
 
     <build>
@@ -44,8 +44,8 @@
                         <phase>deploy</phase>
                         <goals><goal>deploy-file</goal></goals>
                         <configuration>
-                            <groupId>${platform.android.groupid}</groupId>
-                            <artifactId>${platform.android.artifactid}</artifactId>
+                            <groupId>${addon.googlemaps.groupid}</groupId>
+                            <artifactId>${addon.googlemaps.artifactid}</artifactId>
                             <packaging>jar</packaging>
                             <version>${jar.version}</version>
                             <file>${jar.path}</file>
@@ -55,6 +55,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/add-ons/google-apis-6-r01/pom.xml b/add-ons/google-apis-6-r01/pom.xml
index 2cffa29f..4b45877e 100644
--- a/add-ons/google-apis-6-r01/pom.xml
+++ b/add-ons/google-apis-6-r01/pom.xml
@@ -13,9 +13,9 @@
     </parent>
 
     <properties>
+        <jar.simpleVersion>6</jar.simpleVersion>
         <!-- careful, path has underscore as nice inconsistency -->
-        <jar.path>${sdk.addons.path}/google_apis-6_r01/libs/maps.jar</jar.path>
-        <jar.version>6-r01</jar.version>
+        <addon.directory>google_apis-6_r01</addon.directory>
     </properties>
 
     <build>
@@ -44,8 +44,8 @@
                         <phase>deploy</phase>
                         <goals><goal>deploy-file</goal></goals>
                         <configuration>
-                            <groupId>${platform.android.groupid}</groupId>
-                            <artifactId>${platform.android.artifactid}</artifactId>
+                            <groupId>${addon.googlemaps.groupid}</groupId>
+                            <artifactId>${addon.googlemaps.artifactid}</artifactId>
                             <packaging>jar</packaging>
                             <version>${jar.version}</version>
                             <file>${jar.path}</file>
@@ -55,6 +55,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/add-ons/pom.xml b/add-ons/pom.xml
index b8922be0..67fde637 100644
--- a/add-ons/pom.xml
+++ b/add-ons/pom.xml
@@ -11,6 +11,36 @@
 	    <artifactId>maven-android-sdk-deployer</artifactId>
 	    <version>0.3</version>
     </parent>
+
+    <properties>
+        <jar.path>${sdk.addons.path}/${addon.directory}/libs/maps.jar</jar.path>
+        <jar.version>${jar.simpleVersion}_r${Pkg.Revision}</jar.version>
+    </properties>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>properties-maven-plugin</artifactId>
+                    <version>1.0-alpha-2</version>
+                    <executions>
+                        <execution>
+                            <phase>initialize</phase>
+                            <goals>
+                                <goal>read-project-properties</goal>
+                            </goals>
+                            <configuration>
+                                <files>
+                                    <file>${sdk.addons.path}/${addon.directory}/source.properties</file>
+                                </files>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
     
     <modules>
         <module>google-apis-3-r03</module>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index cce40f8b..b6a5dcea 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -17,7 +17,32 @@
         <jar.path>${jar.directory}/android.jar</jar.path>
         <jar.version>${jar.simpleVersion}_r${Pkg.Revision}</jar.version>
     </properties>
-    
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>properties-maven-plugin</artifactId>
+                    <version>1.0-alpha-2</version>
+                    <executions>
+                        <execution>
+                            <phase>initialize</phase>
+                            <goals>
+                                <goal>read-project-properties</goal>
+                            </goals>
+                            <configuration>
+                                <files>
+                                    <file>${jar.directory}/source.properties</file>
+                                </files>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
     <modules>
         <module>android-1.1</module>
         <module>android-1.5</module>
diff --git a/pom.xml b/pom.xml
index a8f592f8..5a0c5c8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,30 +41,4 @@
         <module>platforms</module>
         <module>add-ons</module>
     </modules>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>properties-maven-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
-                    <executions>
-                        <execution>
-                            <phase>initialize</phase>
-                            <goals>
-                                <goal>read-project-properties</goal>
-                            </goals>
-                            <configuration>
-                                <files>
-                                    <file>${jar.directory}/source.properties</file>
-                                </files>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
 </project>