diff -urpN libc/sysdeps/s390/s390-32/elf/start.S libc-s390/sysdeps/s390/s390-32/elf/start.S
--- libc/sysdeps/s390/s390-32/elf/start.S	2004-08-16 00:50:59.000000000 -0400
+++ libc-s390/sysdeps/s390/s390-32/elf/start.S	2006-03-29 14:17:48.000000000 -0500
@@ -88,9 +88,9 @@ _start:
 	l       %r12,.L5-.Llit(%r13)    # load .got pointer
 	la	%r6,0(%r13,%r6)
 	la	%r5,0(%r13,%r5)
-	la	%r2,0(%r13,%r2)
-	la	%r1,0(%r13,%r1)
 	la	%r12,0(%r13,%r12)
+	l	%r2,0(%r12,%r2)
+	la	%r1,0(%r13,%r1)
 #endif
 
 	/* ok, now branch to the libc main routine */
@@ -108,7 +108,7 @@ _start:
 #else
 .L1:    .long  __libc_csu_init-.Llit
 .L2:    .long  __libc_csu_fini-.Llit
-.L3:    .long  main-.Llit
+.L3:    .long  main@GOT
 .L4:    .long  __libc_start_main@plt-.Llit
 .L5:    .long  _GLOBAL_OFFSET_TABLE_-.Llit
 #endif
diff -urpN libc/sysdeps/s390/s390-64/elf/start.S libc-s390/sysdeps/s390/s390-64/elf/start.S
--- libc/sysdeps/s390/s390-64/elf/start.S	2004-08-16 00:50:55.000000000 -0400
+++ libc-s390/sysdeps/s390/s390-64/elf/start.S	2006-03-29 14:17:48.000000000 -0500
@@ -78,12 +78,14 @@ _start:
 	la	%r7,160(%r15)
 	larl	%r6,__libc_csu_fini	# load pointer to __libc_csu_fini
 	larl	%r5,__libc_csu_init	# load pointer to __libc_csu_init
-	larl	%r2,main		# load pointer to main
 
 	/* Ok, now branch to the libc main routine.  */
 #ifdef PIC
+	larl	%r2,main@GOTENT		# load pointer to main
+	lg	%r2,0(%r2)
 	brasl	%r14,__libc_start_main@plt
 #else
+	larl	%r2,main		# load pointer to main
 	brasl	%r14,__libc_start_main
 #endif
 
