diff --git a/artiq/firmware/libboard/config.rs b/artiq/firmware/libboard/config.rs
index 5c673da5b..bfa3745f5 100644
--- a/artiq/firmware/libboard/config.rs
+++ b/artiq/firmware/libboard/config.rs
@@ -5,7 +5,7 @@ mod imp {
     use cache;
     use spiflash;
 
-    // One flash sector immediately after the bootloader.
+    // One flash sector immediately before the firmware.
     const ADDR: usize = ::mem::FLASH_BOOT_ADDRESS - spiflash::PAGE_SIZE;
     const SIZE: usize = spiflash::PAGE_SIZE;
 
diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py
index 61199af60..1033a1af0 100755
--- a/artiq/frontend/artiq_flash.py
+++ b/artiq/frontend/artiq_flash.py
@@ -69,8 +69,8 @@ def main():
             "start": "xc7_program xc7.tap",
             "gateware": 0x000000,
             "bios": 0xaf0000,
-            "storage": 0xb00000,
-            "runtime": 0xb10000,
+            "storage": 0xb30000,
+            "runtime": 0xb40000,
         },
     }[opts.target]