diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1276e83..a0fe0e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,15 @@
-### 3.0.1
+### 3.1.0
+- Major refactoring of android plugin.
+The method for modifying the javaCompile task is now *way* less hackey. In fact,
+it is much closer to the original way that it was done. I had originally
+abandoned this approach because it was breaking increment compilation is some
+weird ways. However, I think I have solved it.
+
+What this means for you: It is now less fickle of plugin application order and
+way less likely to break other plugins.
+- Properly split bootclasspath if it has multiple paths
+
+#### 3.0.1
 - Fixed occasional "Build exception: cannot call Task.setEnabled(boolean)" error.
 - Fixed minor warning typo.
 - Uploaded to the gradle plugin portal.
diff --git a/README.md b/README.md
index 5eaa0e3..5da629d 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Usage
       }
 
       dependencies {
-         classpath 'me.tatarka:gradle-retrolambda:3.0.1'
+         classpath 'me.tatarka:gradle-retrolambda:3.1.0'
       }
    }
 
@@ -39,7 +39,7 @@ Usage
    alternativly, you can use the new plugin syntax for gradle `2.1+`
    ```groovy
    plugins {
-      id "me.tatarka.retrolambda" version "3.0.1"
+      id "me.tatarka.retrolambda" version "3.1.0"
    }
    ```
 
@@ -92,7 +92,7 @@ retrolambda {
 ### Using a Different Version of the retrolambda.jar
 
 The default version of retrolambda used is
-`'net.orfjackal.retrolambda:retrolambda:2.0.0'`. If you want to use a different
+`'net.orfjackal.retrolambda:retrolambda:2.0.2'`. If you want to use a different
 one, you can configure it in your dependencies.
 
 ```groovy
diff --git a/build.gradle b/build.gradle
index 0ff7810..ece59da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ repositories {
 }
 
 group = 'me.tatarka'
-version = '3.1.0-SNAPSHOT'
+version = '3.1.0'
 
 sourceCompatibility = '1.6'
 
diff --git a/settings.gradle b/settings.gradle
index 35204a4..6ec11c5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
 include ':sample-java',
         ':sample-java-default-methods',
         ':sample-android-app',
-        ':sample-android-lib'
\ No newline at end of file
+        ':sample-android-lib'
diff --git a/src/main/groovy/me/tatarka/RetrolambdaPlugin.groovy b/src/main/groovy/me/tatarka/RetrolambdaPlugin.groovy
index 598c2fc..940cbda 100644
--- a/src/main/groovy/me/tatarka/RetrolambdaPlugin.groovy
+++ b/src/main/groovy/me/tatarka/RetrolambdaPlugin.groovy
@@ -31,7 +31,7 @@ import org.gradle.api.plugins.JavaPlugin
  * To change this template use File | Settings | File Templates.
  */
 public class RetrolambdaPlugin implements Plugin<Project> {
-    protected static def retrolambdaCompile = "net.orfjackal.retrolambda:retrolambda:2.0.0"
+    protected static def retrolambdaCompile = "net.orfjackal.retrolambda:retrolambda:2.0.2"
 
     @Override
     void apply(Project project) {