diff --git a/firmware/app.lds b/firmware/app.lds
index 2629d563fa..4cf614733b 100644
--- a/firmware/app.lds
+++ b/firmware/app.lds
@@ -24,15 +24,39 @@ SECTIONS
     {
         *(.rodata)
     }
+
     .bss :
     {
-       _end = .;
-       _stack = . + 0x1000;
        _edata = .;
+        *(.bss)
+        *(COMMON)
+       _end = .;
+    }
+
+    .stack :
+    {
+       *(.stack)
+       _stack = . + 0x8000;
+    }
+
+    .heap :
+    {
+        _poolstart = .;
+        _poolend = . + 0x20000;
+    }
+
+    .mp3buf :
+    {
+        _mp3buf = .;
+    }
+
+    .mp3end 0x09200000 :
+    {
+        _mp3end = .;
     }
 
     .pad 0x0900C800 :
     {
         LONG(0);
     }
-  }
+}
diff --git a/firmware/gdb.lds b/firmware/gdb.lds
index 7fdf8caf7d..a26d8b2c91 100644
--- a/firmware/gdb.lds
+++ b/firmware/gdb.lds
@@ -24,12 +24,34 @@ SECTIONS
     {
         *(.rodata)
     }
+
     .bss :
     {
        _edata = .;
         *(.bss)
         *(COMMON)
        _end = .;
+    }
+
+    .stack :
+    {
+       *(.stack)
        _stack = . + 0x8000;
     }
+
+    .heap :
+    {
+        _poolstart = .;
+        _poolend = . + 0x20000;
+    }
+
+    .mp3buf :
+    {
+        _mp3buf = .;
+    }
+
+    .mp3end 0x09200000 :
+    {
+        _mp3end = .;
+    }
 }