diff --git a/kernel/trunk/const.inc b/kernel/trunk/const.inc
index 29db8e50b3..ff97d675fa 100644
--- a/kernel/trunk/const.inc
+++ b/kernel/trunk/const.inc
@@ -251,9 +251,9 @@ SYS_SHUTDOWN        = OS_BASE + 0x000FF00
 TASK_ACTIVATE       = OS_BASE + 0x000FF01
 
 
-TMP_STACK_TOP       = 0x006CC00
+TMP_STACK_TOP       = 0x007CC00
 
-sys_proc            = OS_BASE + 0x006F000
+sys_proc            = OS_BASE + 0x007E000
 
 SLOT_BASE           = OS_BASE + 0x0080000
 
diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc
index 0bcb9c6692..3195b2f565 100644
--- a/kernel/trunk/data32.inc
+++ b/kernel/trunk/data32.inc
@@ -528,6 +528,9 @@ if ~ lang eq sp
 diff16 "end of .bss",0,$
 end if
 
+; check if kernel fits memmap
+assert $-OS_BASE+0x1000 < TMP_STACK_TOP
+
 org (OS_BASE+0x0100000)
 
 ; Currently size of memory allocated for the ramdisk is fixed.
diff --git a/kernel/trunk/memmap.inc b/kernel/trunk/memmap.inc
index addd983108..6f029b5ee6 100644
--- a/kernel/trunk/memmap.inc
+++ b/kernel/trunk/memmap.inc
@@ -145,15 +145,10 @@
 ;   FFF5  byte        1 do not draw pointer
 ;   FFFF  byte        do not change task for 1/100 sec.
 ;
-; 0x80010000 ->  6CBFF   kernel, 32-bit run-time code (up to 371 Kb)
-
-; 0x8006CC00 ->  6DBFF   stack at boot time (4Kb)
+; 0x80010000 ->  7BC00   kernel, 32-bit run-time code (up to 431k)
 ;
-; 0x8006DC00 ->  6E5FF   free (2560)
-; 0x8006E600 ->  6Efff   free (2560)
-; 0x8006F000 ->  6FFFF   main page directory
-
-; 0x80070000 ->  7FFFF   data of retrieved disks and partitions (Mario79)
+; 0x8007CC00 ->  7DBFF   stack at boot time (4k)
+; 0x8007E000 ->  7FFFF   main page directory
 ; 0x80080000 ->  8FFFF   additional app info, in 256 byte steps - 256 entries
 ;
 ;         00  11db  name of app running
@@ -196,7 +191,7 @@
 ;         BC dword  address of debug event memory
 ;         C0  5 dd  thread debug registers: DR0,DR1,DR2,DR3,DR7
 ;
-; 0x80090000 ->  9FFFF   tmp (64k) - unused?
+; 0x80090000 ->  9FFFF   free (64k)
 ; 0x800A0000 ->  AFFFF   screen access area
 ; 0x800B0000 ->  FFFFF   bios rest in peace -area (320k)        ?
 ; 0x80100000 -> 27FFFF   diskette image (1m5)