diff --git a/ChangeLog b/ChangeLog
index 0a954df3c7..9d9b3ae980 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/powerpc/powerpc64/setjmp-common.S [PTR_MANGLE]: Also
+	mangle r1.
+	* sysdeps/powerpc/powerpc64/__longjmp-common.S [PTR_DEMANGLE]: Also
+	demangle  r1.
+
 2005-12-26  Steven Munroe  <sjmunroe@us.ibm.com>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S:
diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64/__longjmp-common.S
index 73967e0093..82d1abd3ce 100644
--- a/sysdeps/powerpc/powerpc64/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S
@@ -109,6 +109,9 @@ aligned_restore_vmx:
 L(no_vmx):
 #endif
 	ld r1,(JB_GPR1*8)(r3)
+#ifdef PTR_DEMANGLE
+	PTR_DEMANGLE (r1, r25)
+#endif
 	ld r2,(JB_GPR2*8)(r3)
 	ld r0,(JB_LR*8)(r3)
 	ld r14,((JB_GPRS+0)*8)(r3)