diff --git a/NEWS b/NEWS
index 55be683ad..31a5313a1 100644
--- a/NEWS
+++ b/NEWS
@@ -58,7 +58,19 @@ See "Autoconf Support" in the manual for details.
 
 ** New `postfix' read option, for SRFI-88 keyword syntax
 ** Some I/O primitives have been inlined, which improves I/O performance
+** New object-based traps infrastructure
 
+This is a GOOPS-based infrastructure that builds on Guile's low-level
+evaluator trap calls and facilitates the development of debugging
+features like single-stepping, breakpoints, tracing and profiling.
+See the `Traps' node of the manual for details.
+
+** New support for working on Guile code from within Emacs
+
+Guile now incorporates the `GDS' library (previously distributed
+separately) for working on Guile code from within Emacs.  See the
+`Using Guile In Emacs' node of the manual for details.
+ 
 * Bugs fixed
 
 ** `scm_add_slot ()' no longer segfaults (fixes bug #22369)
diff --git a/doc/ref/ChangeLog b/doc/ref/ChangeLog
index 24e5e33ab..d39180df4 100644
--- a/doc/ref/ChangeLog
+++ b/doc/ref/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-05  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* scheme-using.texi (Using Guile in Emacs): Add concept index
+	entries `GDS' and `Emacs'.
+
+	* api-debug.texi (Debugging): Add concept index entry `Debugging'.
+
 2008-05-04  Ludovic Courtès  <ludo@gnu.org>
 
 	* guile.texi (Guile Modules): Include `autoconf.texi'.
diff --git a/doc/ref/api-debug.texi b/doc/ref/api-debug.texi
index 0e8c6909f..d99a56724 100644
--- a/doc/ref/api-debug.texi
+++ b/doc/ref/api-debug.texi
@@ -8,6 +8,7 @@
 @node Debugging
 @section Debugging Infrastructure
 
+@cindex Debugging
 In order to understand Guile's debugging facilities, you first need to
 understand a little about how the evaluator works and what the Scheme
 stack is.  With that in place we explain the low level trap calls that
diff --git a/doc/ref/scheme-using.texi b/doc/ref/scheme-using.texi
index 986252eac..092fb4e39 100644
--- a/doc/ref/scheme-using.texi
+++ b/doc/ref/scheme-using.texi
@@ -359,6 +359,8 @@ debugger to continue.)
 @node Using Guile in Emacs
 @section Using Guile in Emacs
 
+@cindex GDS
+@cindex Emacs
 There are several options for working on Guile Scheme code in Emacs.
 The simplest are to use Emacs's standard @code{scheme-mode} for
 editing code, and to run the interpreter when you need it by typing