diff --git a/docs/memory-map.txt b/docs/memory-map.txt
new file mode 100644
index 0000000..fe902eb
--- /dev/null
+++ b/docs/memory-map.txt
@@ -0,0 +1,16 @@
+Memory Map
+==========
+__This document specifies the **virtual** memory map. The **physical** memory
+map is not OS defined and should be provided by the bootloader.__
+
+| 00000000 | Null Page		|
+| 00001000 | TODO: userspace	|
+| C0000000 | Kernel Base	|
+| C0100000 | Kernel Binary Base	|
+| C6000000 | VMM Bitmap		|
+| C8000000 | Kernel Framebuffer	|
+| CFFE0000 | PMM Bitmap		|
+| D0000000 | Kernel Heap	|
+| F0000000 | Kernel Shared	|
+| FFFFF000 | Recursive pagedir	|
+
diff --git a/kernel/include/kernel.h b/kernel/include/kernel.h
index ca44a92..ed25a42 100644
--- a/kernel/include/kernel.h
+++ b/kernel/include/kernel.h
@@ -8,8 +8,8 @@
  * Virtual memory addresses
  */
 #define USER_HEAP	 0x10000000
-#define USER_STACK	 0xBF000000
 #define USER_SHARED	 0xA0000000
+#define USER_STACK	 0xBF000000
 #define KERNEL_BASE	 0xC0000000
 #define KERNEL_SIZE	 0x10000000
 #define KERNEL_HEAP_BASE 0xD0000000