Index: kernel/generic/include/config.h
===================================================================
--- kernel/generic/include/config.h	(revision 0aae87a68b103134fdc85e357962274d6849b220)
+++ kernel/generic/include/config.h	(revision 67b152eac7904a434fc44aeec4f36587b34d9f81)
@@ -44,4 +44,6 @@
 #define STACK_FRAMES  TWO_FRAMES
 #define STACK_SIZE    ((1 << STACK_FRAMES) << PAGE_WIDTH)
+
+#define STACK_SIZE_USER	((1 << STACK_FRAMES) * 1024 * 1024)
 
 #define CONFIG_INIT_TASKS        32
Index: kernel/generic/src/main/kinit.c
===================================================================
--- kernel/generic/src/main/kinit.c	(revision 0aae87a68b103134fdc85e357962274d6849b220)
+++ kernel/generic/src/main/kinit.c	(revision 67b152eac7904a434fc44aeec4f36587b34d9f81)
@@ -176,5 +176,5 @@
 	 * stack with this default size.
 	 */
-	sysinfo_set_item_val("default.stack_size", NULL, STACK_SIZE);
+	sysinfo_set_item_val("default.stack_size", NULL, STACK_SIZE_USER);
 	
 	interrupts_enable();
Index: kernel/generic/src/proc/program.c
===================================================================
--- kernel/generic/src/proc/program.c	(revision 0aae87a68b103134fdc85e357962274d6849b220)
+++ kernel/generic/src/proc/program.c	(revision 67b152eac7904a434fc44aeec4f36587b34d9f81)
@@ -82,6 +82,6 @@
 	as_area_t *area = as_area_create(as,
 	    AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
-	    AS_AREA_LATE_RESERVE, STACK_SIZE, AS_AREA_ATTR_NONE, &anon_backend,
-	    NULL, &virt, 0);
+	    AS_AREA_LATE_RESERVE, STACK_SIZE_USER, AS_AREA_ATTR_NONE,
+	    &anon_backend, NULL, &virt, 0);
 	if (!area) {
 		task_destroy(prg->task);
@@ -94,5 +94,5 @@
 	kernel_uarg->uspace_entry = (void *) entry_addr;
 	kernel_uarg->uspace_stack = (void *) virt;
-	kernel_uarg->uspace_stack_size = STACK_SIZE;
+	kernel_uarg->uspace_stack_size = STACK_SIZE_USER;
 	kernel_uarg->uspace_thread_function = NULL;
 	kernel_uarg->uspace_thread_arg = NULL;
