diff --git a/README.md b/README.md
index 1a48cb44..ea8be1fc 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ For more information about the Protobuf Compiler, please refer to
 [Google Developers Site](https://developers.google.com/protocol-buffers/docs/reference/java-generated?csw=1).
 
 ## Latest Version
-The latest version is ``0.6.0``. It is available on Maven Central. To add
+The latest version is ``0.6.1``. It is available on Maven Central. To add
 dependency to it:
 ```gradle
 buildscript {
@@ -19,7 +19,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.google.protobuf:protobuf-gradle-plugin:0.6.0'
+    classpath 'com.google.protobuf:protobuf-gradle-plugin:0.6.1'
   }
 }
 ```
@@ -33,7 +33,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath 'com.google.protobuf:protobuf-gradle-plugin:0.6.0-SNAPSHOT'
+    classpath 'com.google.protobuf:protobuf-gradle-plugin:0.6.2-SNAPSHOT'
   }
 }
 ```
diff --git a/build.gradle b/build.gradle
index 3fc09ea3..81fce698 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ apply plugin: "com.gradle.plugin-publish"
 apply plugin: 'signing'
 
 group = 'com.google.protobuf'
-version = '0.6.0'
+version = '0.6.1'
 
 ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
diff --git a/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy b/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
index 1096322a..cd5983cf 100644
--- a/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
+++ b/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
@@ -298,6 +298,7 @@ class ProtobufPlugin implements Plugin<Project> {
         description = "Extracts proto files/dependencies specified by 'protobuf' configuration"
         destDir = getExtractedProtosDir(sourceSetName) as File
         configName = Utils.getConfigName(sourceSetName, 'protobuf')
+        dependsOn project.configurations.getByName(configName)
       }
     }
 
@@ -322,6 +323,7 @@ class ProtobufPlugin implements Plugin<Project> {
         description = "Extracts proto files from compile dependencies for includes"
         destDir = getExtractedIncludeProtosDir(sourceSetName) as File
         configName = Utils.getConfigName(sourceSetName, 'compile')
+        dependsOn project.configurations.getByName(configName)
       }
     }