diff --git a/ChangeLog b/ChangeLog
index 5b2d4cfd29..06fab9ec36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-25  Richard Henderson  <rth@redhat.com>
+
+	* sysdeps/alpha/elf/start.S (_start): Use $15 as frame unwind
+	instead of $31.  Zero $15.
+	* sysdeps/unix/sysv/linux/alpha/clone.S (thread_start): Likewise.
+
 2004-08-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* nscd/connections.c: Make socket nonblocking so that threads
diff --git a/sysdeps/alpha/elf/start.S b/sysdeps/alpha/elf/start.S
index c6d7587314..3c2bc59adc 100644
--- a/sysdeps/alpha/elf/start.S
+++ b/sysdeps/alpha/elf/start.S
@@ -44,10 +44,11 @@
 	.ent _start, 0
 	.type _start,@function
 _start:
-	.frame	$31, 0, $31
+	.frame	$15, 0, $15
 	br	gp, 1f
 1:	ldgp	gp, 0(gp)
 	subq	sp, 16, sp
+	mov	0, $15
 	.prologue 0
 
   /* Load address of the user's main function.  */
diff --git a/sysdeps/unix/sysv/linux/alpha/clone.S b/sysdeps/unix/sysv/linux/alpha/clone.S
index daa804c3fc..b4766ec457 100644
--- a/sysdeps/unix/sysv/linux/alpha/clone.S
+++ b/sysdeps/unix/sysv/linux/alpha/clone.S
@@ -89,7 +89,8 @@ $error:
 
 	.ent thread_start
 thread_start:
-	.frame	zero,0,zero,0
+	.frame	fp,0,fp,0
+	mov	0, fp
 	.prologue 0
 
 	/* Load up the arguments.  */