diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..c401f19a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.bat    text eol=crlf
\ No newline at end of file
diff --git a/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.jar b/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.jar
index e8c6bf7b..2c6137b8 100644
Binary files a/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.jar and b/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.properties b/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.properties
index 72123f55..d8ecefbc 100644
--- a/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
diff --git a/initializr/src/main/resources/project/gradle/gradlew b/initializr/src/main/resources/project/gradle/gradlew
index 97fac783..9d82f789 100755
--- a/initializr/src/main/resources/project/gradle/gradlew
+++ b/initializr/src/main/resources/project/gradle/gradlew
@@ -56,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
diff --git a/initializr/src/main/resources/project/gradle/gradlew.bat b/initializr/src/main/resources/project/gradle/gradlew.bat
index 8a0b282a..5f192121 100644
--- a/initializr/src/main/resources/project/gradle/gradlew.bat
+++ b/initializr/src/main/resources/project/gradle/gradlew.bat
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args
diff --git a/initializr/src/main/resources/templates/starter-build.gradle b/initializr/src/main/resources/templates/starter-build.gradle
index d87409da..4cd12417 100644
--- a/initializr/src/main/resources/templates/starter-build.gradle
+++ b/initializr/src/main/resources/templates/starter-build.gradle
@@ -64,5 +64,5 @@ eclipse {
 }
 
 task wrapper(type: Wrapper) {
-	gradleVersion = '2.9'
+	gradleVersion = '2.12'
 }