diff --git a/ChangeLog b/ChangeLog
index 3e6b4f5682..6fa34b15bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-09  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* Makefile.am (SUBDIRS): remove m4 directory (does not have a
+	Makefile.am). 
+
 2004-06-09  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* Makefile.am (dist_noinst_DATA): use the dist_ and noinst_
diff --git a/Makefile.am b/Makefile.am
index 11db973d92..1778e4ff5a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,9 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
 DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
 if USE_INCLUDED_BOOST
-SUBDIRS = m4 config development intl po boost src sourcedoc lib
+SUBDIRS = config development intl po boost src sourcedoc lib
 else
-SUBDIRS = m4 config development intl po src sourcedoc lib
+SUBDIRS = config development intl po src sourcedoc lib
 endif
 
 EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \