diff --git a/layout.ld b/layout.ld
index 4a6bda51..5403d7d1 100644
--- a/layout.ld
+++ b/layout.ld
@@ -2,9 +2,7 @@ ENTRY(ram64_start)
 
 PHDRS
 {
-  rodata PT_LOAD FILEHDR PHDRS ;
-  data   PT_LOAD               ;
-  text   PT_LOAD               ;
+  program PT_LOAD FILEHDR PHDRS ;
 }
 
 /* Loaders like to put stuff in low memory (< 1M), so we don't use it. */
@@ -19,12 +17,10 @@ SECTIONS
 	. = ram_min;
 	. += SIZEOF_HEADERS;
 
-	.rodata : { *(.rodata .rodata.*)            } :rodata
-	.data   : { *(.data .data.*) *(.bss .bss.*) } :data
-	.text   : {
-		*(.text .text.*)
-		*(.ram64)
-	} :text
+	.rodata : { *(.rodata .rodata.*) } :program
+	.text   : { *(.text .text.*)     } :program
+	.data   : { *(.data .data.*)     } :program
+	.bss    : { *(.bss .bss.*)       } :program
 
 	firmware_ram_size = . - ram_min;
 
diff --git a/src/asm/ram64.s b/src/asm/ram64.s
index 0e94f98a..09bbb942 100644
--- a/src/asm/ram64.s
+++ b/src/asm/ram64.s
@@ -1,4 +1,4 @@
-.section .ram64, "ax"
+.section .text, "ax"
 .global ram64_start
 .code64