diff --git a/build.gradle b/build.gradle
index 440b71dec9cd..baec5b4f79e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -142,6 +142,5 @@ task release(dependsOn: [zip, tar]) << {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '0.9-rc-3'
-    jarPath = 'gradle'
+    gradleVersion = '0.9'
 }
diff --git a/gradle/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 86%
rename from gradle/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
index 83af4d863f70..1e9dece2bb92 100644
Binary files a/gradle/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 78%
rename from gradle/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
index 9acd4e06cdd6..8b08afe71aef 100644
--- a/gradle/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,8 @@
-#Sun Dec 19 05:50:24 IST 2010
+#Sun Dec 19 19:52:10 IST 2010
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-distributionVersion=0.9-rc-3
+distributionVersion=0.9
 zipStorePath=wrapper/dists
 urlRoot=http\://dist.codehaus.org/gradle
 distributionName=gradle
diff --git a/gradlew b/gradlew
index e681512a9ae5..51f64a6952e4 100755
--- a/gradlew
+++ b/gradlew
@@ -63,8 +63,8 @@ if $cygwin ; then
 fi
 
 STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
-CLASSPATH=`dirname "$0"`/gradle/gradle-wrapper.jar
-WRAPPER_PROPERTIES=`dirname "$0"`/gradle/gradle-wrapper.properties
+CLASSPATH=`dirname "$0"`/gradle/wrapper/gradle-wrapper.jar
+WRAPPER_PROPERTIES=`dirname "$0"`/gradle/wrapper/gradle-wrapper.properties
 # Determine the Java command to use to start the JVM.
 if [ -z "$JAVACMD" ] ; then
     if [ -n "$JAVA_HOME" ] ; then
diff --git a/gradlew.bat b/gradlew.bat
index 670e4f39bac9..e3f1ad8edae6 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -101,8 +101,8 @@ set CMD_LINE_ARGS=%$
 @rem Setup the command line
 
 set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
-set CLASSPATH=%DIRNAME%\gradle\gradle-wrapper.jar
-set WRAPPER_PROPERTIES=%DIRNAME%\gradle\gradle-wrapper.properties
+set CLASSPATH=%DIRNAME%\gradle\wrapper\gradle-wrapper.jar
+set WRAPPER_PROPERTIES=%DIRNAME%\gradle\wrapper\gradle-wrapper.properties
 set JAVA_EXE=%JAVA_HOME%\bin\java.exe
 
 set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%"