diff --git a/THANKS b/THANKS
index 769bef739..59eaf13f9 100644
--- a/THANKS
+++ b/THANKS
@@ -59,6 +59,7 @@ For fixes or providing information which led to a fix:
            Arno Peters
 	    Ron Peterson
           David Pirotte
+         Carlos Pita
             Ken Raeburn
         Andreas Rottmann
 	  Kevin Ryde
diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 9786388b5..2385a45f8 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-30  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* debugging/ice-9-debugger-extensions.scm (debug-trap): Use
+	`debugger-command-loop' instead of `read-and-dispatch-commands',
+	which isn't actually available.  Thanks to Carlos Pita for
+	reporting this.
+	(debugger-command-loop): Define here for 1.6.x.
+
 2006-09-25  Neil Jerram  <neil@ossau.uklinux.net>
 
 	* debugging/ice-9-debugger-extensions.scm (debugger:step):
diff --git a/ice-9/debugging/ice-9-debugger-extensions.scm b/ice-9/debugging/ice-9-debugger-extensions.scm
index 217d935b9..2770c1f73 100644
--- a/ice-9/debugging/ice-9-debugger-extensions.scm
+++ b/ice-9/debugging/ice-9-debugger-extensions.scm
@@ -121,6 +121,11 @@ print the result obtained."
 
 (define *not-yet-introduced* #t)
 
+(cond ((string>=? (version) "1.7"))
+      (else
+       (define (debugger-command-loop state)
+	 (read-and-dispatch-commands state (current-input-port)))))
+
 (define-public (debug-trap trap-context)
   "Invoke the Guile debugger to explore the stack at the specified @var{trap}."
   (start-stack 'debugger
@@ -144,7 +149,7 @@ print the result obtained."
 			   (display "There is 1 frame on the stack.\n\n")
 			   (format #t "There are ~A frames on the stack.\n\n" ssize))))
 		 (write-state-short-with-source-location state)
-		 (read-and-dispatch-commands state (current-input-port)))))
+		 (debugger-command-loop state))))
 
 (define write-state-short-with-source-location
   (cond ((string>=? (version) "1.7")