diff --git a/.travis.yml b/.travis.yml
index a5e140a..f887409 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ jdk:
 before_install:
   - chmod +x gradlew
 
-env: GRADLE_OPTS="-Dorg.gradle.daemon=true -Xmx1024m -Xms256m"
+env: GRADLE_OPTS=-Dorg.gradle.daemon=true
 env: CI_OPTS=--stacktrace
 
 install: /bin/true
diff --git a/build.gradle b/build.gradle
index d8bc8b0..bcb5c09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,6 +101,13 @@ if (!has("skipPackageInfo")) {
 
 task wrapper(type: Wrapper) {
 	gradleVersion = '2.4'
+	def jvmOpts='-Xmx1024m -Xms256m'
+	inputs.property("jvmOpts", jvmOpts)
+	doLast {
+		def optsEnvVar = "DEFAULT_JVM_OPTS"
+		scriptFile.write scriptFile.text.replace("$optsEnvVar=\"\"", "$optsEnvVar=\"$jvmOpts\"")
+		batchScript.write batchScript.text.replace("set $optsEnvVar=", "set $optsEnvVar=$jvmOpts")
+	}
 }
 
 task javadocJar(type: Jar) {
diff --git a/circle.yml b/circle.yml
index eb3efff..be88d48 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,7 +2,7 @@ machine:
   java:
     version: oraclejdk7
   environment:
-    GRADLE_OPTS: -Dorg.gradle.daemon=true  -Xmx1024m -Xms256m
+    GRADLE_OPTS: -Dorg.gradle.daemon=true
     CI_OPTS: --stacktrace --debug
 
 test:
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 689b7a7..dbc7d44 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Mon Jun 22 13:29:56 EDT 2015
+#Mon Jun 22 14:56:06 EDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 91a7e26..8c1075e 100755
--- a/gradlew
+++ b/gradlew
@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS="-Xmx1024m -Xms256m"
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
diff --git a/gradlew.bat b/gradlew.bat
index aec9973..c750a85 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -9,7 +9,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS=-Xmx1024m -Xms256m
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.