diff --git a/DaoCore/build.gradle b/DaoCore/build.gradle
index 61bc06e53..9701578b2 100644
--- a/DaoCore/build.gradle
+++ b/DaoCore/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 group = 'org.greenrobot'
-archivesBaseName = 'greendao-encryption'
-version = '3.0.0-beta3'
+archivesBaseName = 'greendao'
+version = '3.0.0'
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
@@ -23,13 +23,13 @@ dependencies {
 }
 
 javadoc {
-    def srcAnnotations = project(':greendao-api').file('src/main/java/')
-    if(!srcAnnotations.directory) throw new GradleScriptException("Not a directory: ${srcAnnotations}", null)
+    def srcApi = project(':greendao-api').file('src/main/java/')
+    if (!srcApi.directory) throw new GradleScriptException("Not a directory: ${srcApi}", null)
     failOnError = false
     title = " greenDAO ${version} API"
-	options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2011-2016 <a href="http://greenrobot.org/">greenrobot.org</a>. All Rights Reserved.</i>'
-	excludes = ['de/greenrobot/dao/internal','de/greenrobot/dao/Internal*']
-    includes += srcAnnotations.absolutePath
+    options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2011-2016 <a href="http://greenrobot.org/">greenrobot.org</a>. All Rights Reserved.</i>'
+    excludes = ['de/greenrobot/dao/internal', 'de/greenrobot/dao/Internal*']
+    includes += srcApi.absolutePath
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
@@ -53,19 +53,17 @@ uploadArchives {
         mavenDeployer {
             // Basic definitions are defined in root project
             pom.project {
-               name 'greenDAO (Encryption)'
-               packaging 'jar'
-               description 'greenDAO is a light and fast ORM for Android'
-               url 'http://greenrobot.org/greendao'
+                name 'greenDAO'
+                description 'greenDAO is a light and fast ORM for Android'
 
-               licenses {
-                   license {
-                       name 'The Apache Software License, Version 2.0'
-                       url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                       distribution 'repo'
-                   }
-               }
-           }
+                licenses {
+                    license {
+                        name 'The Apache Software License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        distribution 'repo'
+                    }
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/DaoGenerator/build.gradle b/DaoGenerator/build.gradle
index 9f4a42e07..8a4f5d59a 100644
--- a/DaoGenerator/build.gradle
+++ b/DaoGenerator/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 group = 'org.greenrobot'
-archivesBaseName = 'greendao-generator-encryption'
-version = '3.0.0-beta3'
+archivesBaseName = 'greendao-generator'
+version = '3.0.0'
 sourceCompatibility = 1.7
 
 repositories {
@@ -36,7 +36,7 @@ test {
     doFirst {
         mkdir 'test-out'
     }
-    doLast{
+    doLast {
         delete 'test-out'
     }
 }
@@ -70,24 +70,17 @@ uploadArchives {
         mavenDeployer {
             // Basic definitions are defined in root project
             pom.project {
-               name 'greenDAO Generator'
-               packaging 'jar'
-               description 'Code generator for greenDAO, the light and fast ORM for Android'
+                name 'greenDAO Generator'
+                description 'Code generator for greenDAO, the light and fast ORM for Android'
 
-               scm {
-                   url 'https://github.com/greenrobot/greenDAO'
-                   connection 'scm:git@github.com:greenrobot/greenDAO.git'
-                   developerConnection 'scm:git@github.com:greenrobot/greenDAO.git'
-               }
-
-               licenses {
-                   license {
-                       name 'GNU General Public License, Version 3'
-                       url 'http://www.gnu.org/licenses/gpl.txt'
-                       distribution 'repo'
-                   }
-               }
-           }
+                licenses {
+                    license {
+                        name 'GNU General Public License, Version 3'
+                        url 'http://www.gnu.org/licenses/gpl.txt'
+                        distribution 'repo'
+                    }
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 042d41721..c1c6a88c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,56 +44,59 @@ subprojects {
         }
     }
 
-    uploadArchives {
-        repositories {
-            mavenDeployer {
-                def isSnapshot = version.endsWith('-SNAPSHOT')
-                def sonatypeRepositoryUrl = isSnapshot ?
-                        "https://oss.sonatype.org/content/repositories/snapshots/"
-                        : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-                if (project.hasProperty('preferedRepo') && project.hasProperty('preferedUsername')
-                        && project.hasProperty('preferedPassword')) {
-                    configuration = configurations.deployerJars
-                    repository(url: preferedRepo) {
-                        authentication(userName: preferedUsername, password: preferedPassword)
-                    }
-                } else if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) {
-                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-                    repository(url: sonatypeRepositoryUrl) {
-                        authentication(userName: sonatypeUsername, password: sonatypePassword)
+    // Use afterEvaluate or all dependencies will be lost in the generated POM
+    afterEvaluate {
+        uploadArchives {
+            repositories {
+                mavenDeployer {
+                    def isSnapshot = version.endsWith('-SNAPSHOT')
+                    def sonatypeRepositoryUrl = isSnapshot ?
+                            "https://oss.sonatype.org/content/repositories/snapshots/"
+                            : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+                    if (project.hasProperty('preferedRepo') && project.hasProperty('preferedUsername')
+                            && project.hasProperty('preferedPassword')) {
+                        configuration = configurations.deployerJars
+                        repository(url: preferedRepo) {
+                            authentication(userName: preferedUsername, password: preferedPassword)
+                        }
+                    } else if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) {
+                        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+                        repository(url: sonatypeRepositoryUrl) {
+                            authentication(userName: sonatypeUsername, password: sonatypePassword)
+                        }
+                    } else {
+                        println "Settings sonatypeUsername/sonatypePassword missing/incomplete for ${project.name}"
                     }
-                } else {
-                    println "Settings sonatypeUsername/sonatypePassword missing/incomplete for ${project.name}"
-                }
 
-                pom.project {
-                    packaging 'jar'
-                    url 'http://greenrobot.org/greendao'
+                    pom.project {
+                        packaging 'jar'
+                        url 'http://greenrobot.org/greendao'
 
-                    scm {
-                        url 'https://github.com/greenrobot/greenDAO'
-                        connection 'scm:git@github.com:greenrobot/greenDAO.git'
-                        developerConnection 'scm:git@github.com:greenrobot/greenDAO.git'
-                    }
+                        scm {
+                            url 'https://github.com/greenrobot/greenDAO'
+                            connection 'scm:git@github.com:greenrobot/greenDAO.git'
+                            developerConnection 'scm:git@github.com:greenrobot/greenDAO.git'
+                        }
 
-                    developers {
-                        developer {
-                            id 'greenrobot'
-                            name 'greenrobot'
+                        developers {
+                            developer {
+                                id 'greenrobot'
+                                name 'greenrobot'
+                            }
                         }
-                    }
 
-                    issueManagement {
-                        system 'GitHub Issues'
-                        url 'https://github.com/greenrobot/greenDAO/issues'
-                    }
+                        issueManagement {
+                            system 'GitHub Issues'
+                            url 'https://github.com/greenrobot/greenDAO/issues'
+                        }
 
-                    organization {
-                        name 'greenrobot'
-                        url 'http://greenrobot.org'
+                        organization {
+                            name 'greenrobot'
+                            url 'http://greenrobot.org'
+                        }
                     }
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/greendao-api/build.gradle b/greendao-api/build.gradle
index a42a29b01..981d1c040 100644
--- a/greendao-api/build.gradle
+++ b/greendao-api/build.gradle
@@ -1,16 +1,16 @@
 apply plugin: 'java'
 
 group = 'org.greenrobot'
-version = '3.0.0-beta3'
+version = '3.0.0'
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 javadoc {
     failOnError = false
-    title = " greenDAO Annotation ${version} API"
-	options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2011-2016 <a href="http://greenrobot.org/">greenrobot.org</a>. All Rights Reserved.</i>'
-	excludes = ['de/greenrobot/dao/internal','de/greenrobot/dao/Internal*']
+    title = " greenDAO API ${version} API"
+    options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2011-2016 <a href="http://greenrobot.org/">greenrobot.org</a>. All Rights Reserved.</i>'
+    excludes = ['de/greenrobot/dao/internal', 'de/greenrobot/dao/Internal*']
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
@@ -34,19 +34,17 @@ uploadArchives {
         mavenDeployer {
             // Basic definitions are defined in root project
             pom.project {
-               name 'greenDAO Annotations'
-               packaging 'jar'
-               description 'greenDAO is a light and fast ORM for Android'
-               url 'http://greenrobot.org/greendao'
-
-               licenses {
-                   license {
-                       name 'The Apache Software License, Version 2.0'
-                       url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                       distribution 'repo'
-                   }
-               }
-           }
+                name 'greenDAO API'
+                description 'greenDAO is a light and fast ORM for Android'
+
+                licenses {
+                    license {
+                        name 'The Apache Software License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        distribution 'repo'
+                    }
+                }
+            }
         }
     }
 }
\ No newline at end of file