diff --git a/ChangeLog.am33 b/ChangeLog.am33
index 0f6d2f4865..8503e03b9b 100644
--- a/ChangeLog.am33
+++ b/ChangeLog.am33
@@ -1,3 +1,8 @@
+2006-01-10  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/am33/bits/setjmp.h (_JMPBUF_UNWINDS): Move macro ...
+	* sysdeps/am33/jmpbuf-unwind.h: ... here, new file.
+
 2005-12-27  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/am33/bits/setjmp.h (_JMPBUF_UNWINDS): Take third argument
diff --git a/ChangeLog.arm b/ChangeLog.arm
index fcce9d65cb..4b9d00ba6d 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,13 @@
+2006-01-10  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/arm/bits/setjmp.h (_JMPBUF_UNWINDS): Move macro ...
+	* sysdeps/arm/jmpbuf-unwind.h: ... here.
+	* sysdeps/arm/fpu/bits/setjmp.h (_JMPBUF_UNWINDS): Macro removed.
+	* sysdeps/arm/eabi/bits/setjmp.h (_JMPBUF_UNWINDS): Macro removed.
+
+	* sysdeps/arm/nptl/jmpbuf-unwind.h: Moved to ...
+	* sysdeps/arm/jmpbuf-unwind.h: ... here.
+
 2005-12-27  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/arm/eabi/bits/setjmp.h (_JMPBUF_UNWINDS): Take third argument