diff --git a/artiq/firmware/satman/main.rs b/artiq/firmware/satman/main.rs
index fb97b2bdb..3b770a2c0 100644
--- a/artiq/firmware/satman/main.rs
+++ b/artiq/firmware/satman/main.rs
@@ -466,8 +466,7 @@ pub extern fn main() -> i32 {
 
     unsafe {
         ALLOC.add_range(&mut _fheap, &mut _eheap);
-        // stack guard disabled, see https://github.com/m-labs/artiq/issues/2067
-        // pmp::init_stack_guard(&_sstack_guard as *const u8 as usize);
+        pmp::init_stack_guard(&_sstack_guard as *const u8 as usize);
     }
 
     clock::init();
diff --git a/artiq/firmware/satman/satman.ld b/artiq/firmware/satman/satman.ld
index 4834c36a1..f58ef38d8 100644
--- a/artiq/firmware/satman/satman.ld
+++ b/artiq/firmware/satman/satman.ld
@@ -12,6 +12,7 @@ SECTIONS
     .text :
     {
         *(.text .text.*)
+        . = ALIGN(0x40000);
     } > main_ram
 
     .eh_frame :