diff --git a/doc/ref/ChangeLog b/doc/ref/ChangeLog
index fdec1467f..ecebd2a76 100644
--- a/doc/ref/ChangeLog
+++ b/doc/ref/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-06  Marius Vollmer  <marius.vollmer@uni-dortmund.de>
+
+	* scheme-control.texi: Document scm_on_unwind_with_scm and
+	scm_on_rewind_with_scm.
+
 2004-01-05  Marius Vollmer  <mvo@zagadka.de>
 
 	* scheme-scheduling.texi: Document scm_with_[un]blocked_asyncs.
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 5c4db53ef..a7c3a1f86 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,22 @@
+2004-01-06  Marius Vollmer  <marius.vollmer@uni-dortmund.de>
+
+	* ports.c (swap_ports, scm_with_current_foo_port): Do not allocate
+	swap_data on stack, use a 'malloc obj'.
+
+	* fluids.h, fluids.c (scm_make_initial_fluids, scm_copy_fluids,
+	scm_swap_fluids, scm_swap_fluids_reverse): Renamed to
+	scm_i_... since they are internal.  Changed all uses.
+
+	* dynwind.c (frame_print): Removed, use the default printer.
+	(WINDER_F_MARK, WINDER_MARK_P, winder_mark): New.
+	(scm_on_unwind_with_scm, scm_on_rewind_with_scm): New. Use above
+	to protect SCM values.
+	
+	* dynwind.h (SCM_F_WIND_EXPLICITELY,
+	SCM_F_WIND_EXPLICITLY): It's "explicitly" not "explicitely", damn.
+	Changed all uses.
+	(scm_on_unwind_with_scm, scm_on_rewind_with_scm): New.
+	
 2004-01-05  Marius Vollmer  <mvo@zagadka.de>
 
 	* ports.h, ports.c (scm_with_current_input_port,
diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 5f726969b..6eaa04c30 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-06  Marius Vollmer  <marius.vollmer@uni-dortmund.de>
+
+	* standalone/test-unwind.c (close_port, delete_file, check_ports):
+	New.
+
 2004-01-03  Marius Vollmer  <mvo@zagadka.de>
 
 	* standalone/test-unwind.c: New test, for the frames stuff.