diff --git a/.appveyor.yml b/.appveyor.yml
index f0c903f69..b7a0e4f2b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -19,7 +19,7 @@ install:
         [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sbt-bin.zip", "C:\sbt")
       }
   - SET PATH=C:\sbt\sbt\bin;%PATH%
-  - SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g -Dfile.encoding=UTF8
+  - SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8
 
 test_script:
   - sbt "-Dsbt.build.version=1.3.0-M4" universal:packageBin
diff --git a/citest/test.sh b/citest/test.sh
index c25555881..1eda5675b 100755
--- a/citest/test.sh
+++ b/citest/test.sh
@@ -13,7 +13,7 @@ export SBT_OPTS=-Dfile.encoding=UTF-8
 
 ./freshly-baked/sbt/bin/sbt about run -v
 
-export SBT_OPTS="-Dfile.encoding=UTF-8 -Xms2048M -Xmx2048M -Xss2M -XX:MaxPermSize=512M"
+export SBT_OPTS="-Dfile.encoding=UTF-8 -Xms2048M -Xmx2048M -Xss2M"
 
 ./freshly-baked/sbt/bin/sbt about run
 
diff --git a/src/universal/conf/sbtconfig.txt b/src/universal/conf/sbtconfig.txt
index a4da43eaf..437b5a21d 100644
--- a/src/universal/conf/sbtconfig.txt
+++ b/src/universal/conf/sbtconfig.txt
@@ -1,14 +1,12 @@
-# Set the java args to high
+# sbt configuration file for Windows
 
--Xmx512M
-
--XX:MaxPermSize=256m
+# Set the java args
 
+-Xms1024m
+-Xmx1024m
+-Xss2M
 -XX:ReservedCodeCacheSize=128m
 
+# Set the extra sbt options
 
-
-# Set the extra SBT options
-
--Dsbt.log.format=true
-
+# -Dsbt.log.format=true