diff --git a/citest/test.sh b/citest/test.sh
index 1eda5675b..499669739 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"
+export SBT_OPTS="-Dfile.encoding=UTF-8 -Xms2048M -Xmx2048M -Xss4M"
 
 ./freshly-baked/sbt/bin/sbt about run
 
diff --git a/src/universal/bin/sbt b/src/universal/bin/sbt
index d9c2efc79..0dab765dc 100755
--- a/src/universal/bin/sbt
+++ b/src/universal/bin/sbt
@@ -148,7 +148,7 @@ addMemory () {
 
   addJava "-Xms${mem}m"
   addJava "-Xmx${mem}m"
-  addJava "-Xss2M"
+  addJava "-Xss4M"
   addJava "-XX:ReservedCodeCacheSize=${codecache}m"
   if [[ (( $java_version < 8 )) ]]; then
     addJava "-XX:${class_metadata_opt}=${class_metadata_size}m"
diff --git a/src/universal/conf/sbtconfig.txt b/src/universal/conf/sbtconfig.txt
index 437b5a21d..50395e227 100644
--- a/src/universal/conf/sbtconfig.txt
+++ b/src/universal/conf/sbtconfig.txt
@@ -4,7 +4,7 @@
 
 -Xms1024m
 -Xmx1024m
--Xss2M
+-Xss4M
 -XX:ReservedCodeCacheSize=128m
 
 # Set the extra sbt options