diff --git a/ChangeLog b/ChangeLog
index 9739d8e9f..4e6ed04e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2006-08-18  Neil Jerram  <neil@ossau.uklinux.net>
 
-	* configure.in: Generate Makefile for ice-9/debugging.
+	* configure.in: Generate Makefile for emacs subdir.
+
+	* Makefile.am (SUBDIRS): Add emacs subdir.
+
+	* configure.in: Generate Makefile for ice-9/debugging subdir.
 
 2006-06-13  Ludovic Courtès  <ludovic.courtes@laas.fr>
 
diff --git a/Makefile.am b/Makefile.am
index a4da8500e..aba01bf7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = oop libguile ice-9 guile-config guile-readline	\
+SUBDIRS = oop libguile ice-9 guile-config guile-readline emacs \
 	  scripts srfi doc examples test-suite benchmark-suite lang am
 
 bin_SCRIPTS = guile-tools
diff --git a/configure.in b/configure.in
index c216c7ef1..798dbbee7 100644
--- a/configure.in
+++ b/configure.in
@@ -1220,6 +1220,7 @@ AC_CONFIG_FILES([
   doc/r5rs/Makefile
   doc/ref/Makefile
   doc/tutorial/Makefile
+  emacs/Makefile
   examples/Makefile
   examples/box-dynamic-module/Makefile
   examples/box-dynamic/Makefile