diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 61be60fe7..6b033a738 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-09  Neil Jerram  <neil@ossau.uklinux.net>
 
+	* debugger/Makefile.am (ice9_debugger_sources): Removed
+	breakpoints.scm, behaviour.scm, trap-hooks.scm.
+	(SUBDIRS): Removed.
+
 	Changes to remove breakpoint support from CVS, as I am now
 	developing this function outside Guile core.
 	
diff --git a/ice-9/debugger/Makefile.am b/ice-9/debugger/Makefile.am
index 83f92867d..42822d8a3 100644
--- a/ice-9/debugger/Makefile.am
+++ b/ice-9/debugger/Makefile.am
@@ -21,11 +21,8 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = breakpoints
-
 # These should be installed and distributed.
-ice9_debugger_sources = behaviour.scm breakpoints.scm command-loop.scm \
-	commands.scm state.scm trap-hooks.scm trc.scm utils.scm
+ice9_debugger_sources = command-loop.scm commands.scm state.scm trc.scm utils.scm
 
 subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/ice-9/debugger
 subpkgdata_DATA = $(ice9_debugger_sources)