diff --git a/AUTHORS b/AUTHORS
index 17903b0a2..549460635 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,5 +22,5 @@ of guile.texi.
 Anthony Green: wrote the original code in the 'threads' directory.
 
 Mikael Djurfeldt: wrote debug.c, debug.h, options.c, options.h,
-srcprop.c, srcprop.h.  Rewrote the code in 'threads'.  Many changes
-throughout.
+srcprop.c, srcprop.h, stacks.h, backtrace.c, backtrace.h.  Rewrote the
+code in 'threads'.  Many changes throughout.
diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index b5cfe6afd..2b55c69c4 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,16 @@
+Mon Oct 14 04:21:51 1996  Mikael Djurfeldt  <mdj@woody.nada.kth.se>
+
+	* debug.scm (make-enable, make-disable): Simplified.
+
+	* boot-9.scm: Renamed %%throw-handler-default -->
+ 	throw-handler-default.
+	((handle-system-error key . arg-list)): Changed the way errors are
+	reported.
+	((scm-style-repl)): Wrap up the call to eval in a start-stack
+ 	acro.
+	((error-catching-loop thunk)): Introduce a lazy-catch into
+ 	error-catching-loop so that the stack can be captured.
+
 Thu Oct 10 22:27:32 1996  Jim Blandy  <jimb@totoro.cyclic.com>
 
 	* mapping.scm (hash-table-mapping): Explicitly request that
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 2e747586e..f0a19462e 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,62 @@
+Mon Oct 14 04:21:51 1996  Mikael Djurfeldt  <mdj@woody.nada.kth.se>
+
+	* debug.c, debug.h: Removed obsolete code.
+
+	* continuations.c, continuations.h, debug.c, gc.c, init.c, root.c,
+	stacks.c: Renamed regs --> scm_contregs.
+
+	* print.c (scm_free_print_state): Cleanup print state before
+	returning it to pool.  It is better to do it here than in
+	scm_prin1 since scm_prin1 is called often.
+
+	* srcprop.c (scm_source_properties, scm_set_source_properties_x,
+ 	s_set_source_property_x): Check that first argument is a pair or a
+	memoized object.
+
+	* srcprop.c, srcprop.h: Made scm_i_filename, scm_i_copy,
+	scm_i_line, scm_i_column and scm_i_breakpoint global.
+
+	* init.c: Added #include "backtrace.h" and #include "stacks.h".
+	(scm_boot_guile_1): Added calls to scm_init_backtrace and
+	scm_init_stacks.
+
+	* debug.h: Added debug object smob declaration and macro
+	definitions.
+
+	* configure.in: Build with backtrace.o and stacks.o if debug
+	support enabled.
+
+	* Makefile.in: Added entries for new files: backtrace.c,
+	backtrace.h, stacks.c and stacks.h.
+
+	* symbols.c (scm_sym2ovcell): Fixed documentation.
+
+	* _scm.h (min, max): Added.
+
+	* async.c: Moved `min' macro to _scm.h.
+
+	* debug.h: New debug options SCM_BACKTRACE_MAXDEPTH and
+	SCM_BACKTRACE_INDENT.
+
+	* eval.c: Added new debug options `maxdepth' and `indent'.
+
+	* print.c (make_print_state): Bugfix: Initialize pstate->ceiling.
+
+	* print.h: Added selector SCM_PRINT_STATE.
+
+	* print.c: New functions: scm_make_print_state,
+ 	scm_free_print_state.
+
+	* print.h: Added declarations for scm_make_print_state,
+ 	scm_free_print_state.
+	
+*	* debug.c (scm_m_start_stack): New acro.
+
+	* debug.h: Small cleanup.
+
+	* init.c (scm_boot_guile_1): Moved scm_init_debug below
+	scm_init_eval.
+
 Sun Oct 13 20:14:53 1996  Jim Blandy  <jimb@totoro.cyclic.com>
 
 	* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,