Index: uspace/lib/libc/arch/amd64/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/amd64/_link.ld.in	(revision f5209056e979fbdfe341077cedd598173ff0370c)
+++ uspace/lib/libc/arch/amd64/_link.ld.in	(revision 8c7294c6b71c80681201b7bf37e1ffe6faf6ba57)
@@ -8,7 +8,7 @@
 
 SECTIONS {
-	. = 0x1000;
+	. = 0x1000 + SIZEOF_HEADERS;
 	
-	.init ALIGN(0x1000) : SUBALIGN(0x1000) {
+	.init : {
 		*(.init);
 	} :text
@@ -17,6 +17,8 @@
 		*(.rodata*);
 	} :text
-	
-	.data ALIGN(0x1000) : SUBALIGN(0x1000) {
+
+	. = . + 0x1000;
+
+	.data : {
 		*(.data);
 	} :data
Index: uspace/lib/libc/arch/arm32/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/arm32/_link.ld.in	(revision f5209056e979fbdfe341077cedd598173ff0370c)
+++ uspace/lib/libc/arch/arm32/_link.ld.in	(revision 8c7294c6b71c80681201b7bf37e1ffe6faf6ba57)
@@ -8,7 +8,7 @@
 
 SECTIONS {
-	. = 0x1000;
+	. = 0x1000 + SIZEOF_HEADERS;
 
-	.init ALIGN(0x1000): SUBALIGN(0x1000) {
+	.init : {
 		*(.init);
 	} : text
@@ -17,6 +17,8 @@
         *(.rodata*);
 	} :text
-	
-	.data ALIGN(0x1000) : SUBALIGN(0x1000) {
+
+	. = . + 0x1000;
+
+	.data : {
 		*(.opd);
 		*(.data .data.*);
Index: uspace/lib/libc/arch/ia32/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/ia32/_link.ld.in	(revision f5209056e979fbdfe341077cedd598173ff0370c)
+++ uspace/lib/libc/arch/ia32/_link.ld.in	(revision 8c7294c6b71c80681201b7bf37e1ffe6faf6ba57)
@@ -8,7 +8,7 @@
 
 SECTIONS {
-	. = 0x1000;
+	. = 0x1000 + SIZEOF_HEADERS;
 
-	.init ALIGN(0x1000) : SUBALIGN(0x1000) {
+	.init : {
 		*(.init);
 	} :text
@@ -17,6 +17,8 @@
                 *(.rodata*);
 	} :text
-	
-	.data ALIGN(0x1000) : SUBALIGN(0x1000) {
+
+	. = . + 0x1000;
+
+	.data : {
 		*(.data);
 	} :data
Index: uspace/lib/libc/arch/ia64/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/ia64/_link.ld.in	(revision f5209056e979fbdfe341077cedd598173ff0370c)
+++ uspace/lib/libc/arch/ia64/_link.ld.in	(revision 8c7294c6b71c80681201b7bf37e1ffe6faf6ba57)
@@ -8,7 +8,7 @@
 
 SECTIONS {
-	. = 0x4000;
+	. = 0x4000 + SIZEOF_HEADERS;
 
-	.init ALIGN(0x4000): SUBALIGN(0x4000) {
+	.init : {
 		*(.init);
 	} : text
@@ -18,5 +18,7 @@
 	} :text
 
-	.got ALIGN(0x4000) : SUBALIGN(0x4000) {
+	. = . + 0x4000;
+
+	.got : {
 		_gp = .;
 		*(.got*);
Index: uspace/lib/libc/arch/mips32/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/mips32/_link.ld.in	(revision f5209056e979fbdfe341077cedd598173ff0370c)
+++ uspace/lib/libc/arch/mips32/_link.ld.in	(revision 8c7294c6b71c80681201b7bf37e1ffe6faf6ba57)
@@ -8,7 +8,7 @@
 
 SECTIONS {
-	. = 0x4000;
+	. = 0x4000 + SIZEOF_HEADERS;
 	
-	.init ALIGN(0x4000) : SUBALIGN(0x4000) {
+	.init : {
 		*(.init);
 	} :text
@@ -17,4 +17,6 @@
 		*(.rodata*);
 	} :text
+
+	. = . + 0x4000;
 
 	.data : {
Index: uspace/lib/libc/arch/ppc32/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/ppc32/_link.ld.in	(revision f5209056e979fbdfe341077cedd598173ff0370c)
+++ uspace/lib/libc/arch/ppc32/_link.ld.in	(revision 8c7294c6b71c80681201b7bf37e1ffe6faf6ba57)
@@ -8,7 +8,7 @@
 
 SECTIONS {
-	. = 0x1000;
+	. = 0x1000 + SIZEOF_HEADERS;
 
-	.init ALIGN(0x1000) : SUBALIGN(0x1000) {
+	.init : {
 		*(.init);
 	} :text
@@ -17,6 +17,8 @@
 		*(.rodata*);
 	} :text
-	
-	.data ALIGN(0x1000) : SUBALIGN(0x1000) {
+
+	. = . + 0x1000;
+
+	.data : {
 		*(.data);
 		*(.sdata);
Index: uspace/lib/libc/arch/ppc64/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/ppc64/_link.ld.in	(revision f5209056e979fbdfe341077cedd598173ff0370c)
+++ uspace/lib/libc/arch/ppc64/_link.ld.in	(revision 8c7294c6b71c80681201b7bf37e1ffe6faf6ba57)
@@ -8,7 +8,7 @@
 
 SECTIONS {
-	. = 0x1000;
+	. = 0x1000 + SIZEOF_HEADERS;
 
-	.init ALIGN(0x1000) : SUBALIGN(0x1000) {
+	.init : {
 		*(.init);
 	} :text
@@ -18,6 +18,8 @@
 		*(.rodata*);
 	} :text
-	
-	.data ALIGN(0x1000) : SUBALIGN(0x1000) {
+
+	. = . + 0x1000;
+
+	.data : {
 		*(.opd);
 		*(.data*);
Index: uspace/lib/libc/arch/sparc64/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/sparc64/_link.ld.in	(revision f5209056e979fbdfe341077cedd598173ff0370c)
+++ uspace/lib/libc/arch/sparc64/_link.ld.in	(revision 8c7294c6b71c80681201b7bf37e1ffe6faf6ba57)
@@ -8,7 +8,7 @@
 
 SECTIONS {
-	. = 0x4000;
+	. = 0x4000 + SIZEOF_HEADERS;
 
-	.init ALIGN(0x4000) : SUBALIGN(0x4000) {
+	.init : {
 		*(.init);
 	} :text
@@ -17,10 +17,12 @@
 		*(.rodata*);
 	} :text
-	
-	.got ALIGN(0x4000) : SUBALIGN(0x4000) {
+
+	. = . + 0x4000;
+
+	.got : {
 		 _gp = .;
 		 *(.got*);
 	} :data
-	.data ALIGN(0x4000) : SUBALIGN(0x4000) {
+	.data : {
 		*(.data);
 		*(.sdata);