diff --git a/src/common.c b/src/common.c
index dae7371..a555e02 100644
--- a/src/common.c
+++ b/src/common.c
@@ -72,11 +72,7 @@ struct extparam conf = {
 	NULL,
 	NULL,
 	NULL,
-#ifdef __FreeBSD__
-	8192, 
-#else
 	0,
-#endif
 	0, -1, 0, 0, 0, 0, 
 	0, 500, 0, 0, 0, 0,
 	6, 600,
diff --git a/src/conf.c b/src/conf.c
index 8468b09..ddf7823 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -161,7 +161,7 @@ int start_proxy_thread(struct child * chp){
 	if(h)CloseHandle(h);
 #else
 	pthread_attr_init(&pa);
-	pthread_attr_setstacksize(&pa,PTHREAD_STACK_MIN + (16384+conf.stacksize));
+	pthread_attr_setstacksize(&pa,PTHREAD_STACK_MIN + (32768+conf.stacksize));
 	pthread_attr_setdetachstate(&pa,PTHREAD_CREATE_DETACHED);
 	pthread_create(&thread, &pa, startsrv, (void *)chp);
 	pthread_attr_destroy(&pa);
diff --git a/src/proxymain.c b/src/proxymain.c
index c9e2d19..54ada6e 100644
--- a/src/proxymain.c
+++ b/src/proxymain.c
@@ -647,7 +647,7 @@ int MODULEMAINFUNC (int argc, char** argv){
  
 #ifndef _WIN32
  pthread_attr_init(&pa);
- pthread_attr_setstacksize(&pa,PTHREAD_STACK_MIN + (16384 + srv.stacksize));
+ pthread_attr_setstacksize(&pa,PTHREAD_STACK_MIN + (32768 + srv.stacksize));
  pthread_attr_setdetachstate(&pa,PTHREAD_CREATE_DETACHED);
 #endif