diff --git a/zipl/boot/eckd2dump.lds.S b/zipl/boot/eckd2dump.lds.S
index d0c9a1ed..e95ed5d5 100644
--- a/zipl/boot/eckd2dump.lds.S
+++ b/zipl/boot/eckd2dump.lds.S
@@ -33,15 +33,15 @@ SECTIONS
   __stage2_head = .;
   .stage2.head : { *(.stage2.head) }
   . = STAGE2_ENTRY;
-  .text.start : {
+  .text : {
     *(.text.start)
+    *(.text .text.*)
   }
-  .text : { *(.text) }
   __ex_table_start = .;
   .ex_table : { *(.ex_table) }
   __ex_table_stop = .;
-  .rodata : {*(.rodata) }
-  .data : { *(.data) }
+  .rodata : {*(.rodata .rodata.*) }
+  .data : { *(.data .data.*) }
 
   . = STAGE2DUMP_TAIL_ADDRESS;
   .stage2dump.tail : { *(.stage2dump.tail)
@@ -59,7 +59,7 @@ SECTIONS
   .eckd2dump_mv.tail : { *(.eckd2dump_mv.tail) }
 #endif
   __bss_start = .;
-  .bss : { *(.bss) }
+  .bss : { *(.bss .bss.*) }
   __bss_stop = .;
 
   . = ECKD2DUMP_HEAP_ADDRESS;
diff --git a/zipl/boot/stage2.lds.S b/zipl/boot/stage2.lds.S
index 2218d5ca..fbf74d58 100644
--- a/zipl/boot/stage2.lds.S
+++ b/zipl/boot/stage2.lds.S
@@ -32,22 +32,22 @@ SECTIONS
   . = STAGE2_LOAD_ADDRESS;
   .stage2.head : { *(.stage2.head) }
   . = STAGE2_ENTRY;
-  .text.start : {
+  .text : {
     *(.text.start)
+    *(.text .text.*)
   }
-  .text : { *(.text) }
   __ex_table_start = .;
   .ex_table : { *(.ex_table) }
   __ex_table_stop = .;
-  .rodata : {*(.rodata) }
-  .data : { *(.data) }
+  .rodata : { *(.rodata .rodata.*) }
+  .data : { *(.data .data.*) }
   __stage2_params = .;
 
   . = STAGE2DUMP_TAIL_ADDRESS;
   .stage2dump.tail : { *(.stage2dump.tail) }
 
   __bss_start = .;
-  .bss : { *(.bss) }
+  .bss : { *(.bss .bss.*) }
   __bss_stop = .;
 
   . = STAGE2_HEAP_ADDRESS;
diff --git a/zipl/boot/stage3.lds.S b/zipl/boot/stage3.lds.S
index 80f39eb6..35ed32d2 100644
--- a/zipl/boot/stage3.lds.S
+++ b/zipl/boot/stage3.lds.S
@@ -34,26 +34,29 @@ SECTIONS
   _stage3_parms = .;
 
   . = STAGE3_ENTRY;
-  .text.start : { *(.text.start) }
-  .text : { *(.text) }
+  .text : {
+    *(.text.start)
+    *(.text .text.*)
+  }
   __ex_table_start = .;
   .ex_table : { *(.ex_table) }
   __ex_table_stop = .;
 
   __bss_start = .;
-  .bss : { *(.bss) }
+  .bss : { *(.bss .bss.*) }
   __bss_stop = .;
-  .rodata : {*(.rodata) }
-  .data : { *(.data) }
+  .rodata : {*(.rodata .rodata.*) }
+  .data : { *(.data .data.*) }
 
   /* Trailer needed for Secure Boot */
-  . = COMMAND_LINE_EXTRA - 32;
+  . = COMMAND_LINE_EXTRA - SIZEOF(.sb.trailer);
   .sb.trailer : {
     QUAD(0x0000c00000000000)
     QUAD(STAGE3_ENTRY + PSW_LOAD)
     QUAD(STAGE3_ENTRY)
     QUAD(0x000000207a49504c)
   }
+  ASSERT(SIZEOF(.sb.trailer) == 32, "Invalid .sb.trailer size")
 
   . = COMMAND_LINE_EXTRA;
   .cmdline_extra : {