diff --git a/link/ram.ld b/link/ram.ld
index f738045..9d1d944 100644
--- a/link/ram.ld
+++ b/link/ram.ld
@@ -15,10 +15,11 @@ SECTIONS
 {
     .start  : 
     {
-        start = ALIGN(2);
-        entry = ALIGN(2);
-        _entry = ALIGN(2);
-        __entry = ALIGN(2);
+    	. = ALIGN(4);
+        start = .;
+        entry = .;
+        _entry = .;
+        __entry = .;
         KEEP (*(.start))
     } >ram
 
@@ -52,7 +53,7 @@ SECTIONS
     } >ram
     .data1          : { *(.data1) } >ram
     .got.plt        : { *(.got.plt) } >ram
-    . = .;
+    . = ALIGN(4);
     _gp = ALIGN(16) + 0x7ff0;
     .got            : { *(.got) }
     /* We want the small data sections together, so single-instruction offsets
@@ -62,7 +63,7 @@ SECTIONS
     {
         *(.sdata .sdata.*)
     } >ram
-    __bss_start = .;
+    __bss_start = ALIGN(4);
     .sbss           :
     {
         *(.sbss .sbss.*)
@@ -80,7 +81,6 @@ SECTIONS
         . = ALIGN(. != 0 ? 32 / 8 : 1);
     } >ram
     . = ALIGN(32 / 8);
-    . = ALIGN(32 / 8);
     _end = .; PROVIDE (end = .);
     . = (ORIGIN(ram) + LENGTH(ram) - DEBUGGER_VAR_SIZE - 0x10);
     stack_ptr = . | ~(LENGTH(ram)-1) & 0x7fffffff;
diff --git a/link/ram_tlb.ld b/link/ram_tlb.ld
index 97e09f6..17a6921 100644
--- a/link/ram_tlb.ld
+++ b/link/ram_tlb.ld
@@ -16,10 +16,11 @@ SECTIONS
 {
     .start  : 
     {
-        start = ALIGN(2);
-        entry = ALIGN(2);
-        _entry = ALIGN(2);
-        __entry = ALIGN(2);
+    	. = ALIGN(4);
+        start = .;
+        entry = .;
+        _entry = .;
+        __entry = .;
         *(.start)
     } >ram
 
@@ -62,7 +63,7 @@ SECTIONS
     {
         *(.sdata .sdata.*)
     } >ram
-    __bss_start = .;
+    __bss_start = ALIGN(4);
     .sbss           :
     {
         *(.sbss .sbss.*)