diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index baa57145be7..d2950c6d9ff 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-13  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* src/pa/hpux32.S: Correct unwind offset calculation for
+	ffi_closure_pa32.
+	* src/pa/linux.S: Likewise.
+
 2006-04-12  James E Wilson  <wilson@specifix.com>
 
 	PR libgcj/26483
@@ -6,7 +12,7 @@
 	(hfa_type_store): Call ldf_fill.
 	(ffi_call): Adjust calls to above routines.  Add local temps for
 	macro result.
-	
+
 2006-04-10  Matthias Klose  <doko@debian.org>
 
 	* testsuite/lib/libffi-dg.exp (libffi-init): Recognize multilib
diff --git a/libffi/src/pa/hpux32.S b/libffi/src/pa/hpux32.S
index 4c4470fbf9b..8f6b4613e66 100644
--- a/libffi/src/pa/hpux32.S
+++ b/libffi/src/pa/hpux32.S
@@ -359,7 +359,7 @@ L$ASFDE2:
 	.sleb128 -5
 
 	.byte   0x4     ;# DW_CFA_advance_loc4
-	.word   L$CFI12-L$CFI11
+	.word   L$CFI22-L$CFI21
 	.byte   0xd     ;# DW_CFA_def_cfa_register = r3
 	.uleb128 0x3
 
diff --git a/libffi/src/pa/linux.S b/libffi/src/pa/linux.S
index 322ceb3e7ee..20be177a9f6 100644
--- a/libffi/src/pa/linux.S
+++ b/libffi/src/pa/linux.S
@@ -348,7 +348,7 @@ ffi_closure_pa32:
 	.sleb128 -5
 
 	.byte   0x4     ;# DW_CFA_advance_loc4
-	.word   .LCFI12-.LCFI11
+	.word   .LCFI22-.LCFI21
 	.byte   0xd     ;# DW_CFA_def_cfa_register = r3
 	.uleb128 0x3