diff --git a/build-aux/bootstrap.sh.in b/build-aux/bootstrap.sh.in
index 6dd69bdb..b44e3ead 100644
--- a/build-aux/bootstrap.sh.in
+++ b/build-aux/bootstrap.sh.in
@@ -20,8 +20,11 @@
 
 LANG=
 MES_ARENA=${MES_ARENA-100000000}
-MES_MAX_ARENA=${MES_MAX_ARENA-100000000}
-MES_STACK=${MES_STACK-500000}
+export MES_ARENA
+MES_MAX_ARENA=${MES_MAX_ARENA-${MES_ARENA}}
+export MES_MAX_ARENA
+MES_STACK=${MES_STACK-10000000}
+export MES_STACK
 
 . build-aux/configure-lib.sh
 
diff --git a/scripts/mescc.in b/scripts/mescc.in
index 255c22f5..64395c82 100644
--- a/scripts/mescc.in
+++ b/scripts/mescc.in
@@ -25,7 +25,10 @@ fi
 MES_ARENA=${MES_ARENA-100000000}
 export MES_ARENA
 
-MES_STACK=${MES_STACK-500000}
+MES_MAX_ARENA=${MES_MAX_ARENA-${MES_ARENA}}
+export MES_MAX_ARENA
+
+MES_STACK=${MES_STACK-10000000}
 export MES_STACK
 
 MES_PREFIX=${MES_PREFIX-@prefix@}