diff --git a/ChangeLog b/ChangeLog
index bd7fd321..77f2052e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2CVS code -
+CVS code -
 - General
 	- malloc->calloc, etc cleanups (DLR).
 	- New option, noconvert (-N, --noconvert) to completely stop
@@ -27,6 +27,8 @@
 	- Add SYSCONFDIR to DEFS, so we can have an /etc/nanorc.
 	- Change localedir line to 1.0's version.
 	- Moved m4/ stuff to its own m4/Makefile.am.
+	- Re-added M4DIR & ACLOCAL_AMFLAGS, make seems to fail without 
+	  it Jordi ;-)
 - configure.in:
 	- Renamed to configure.ac.
 - configure.ac:
diff --git a/Makefile.am b/Makefile.am
index 921a2024..e07c26d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 ## $Id$
 AUTOMAKE_OPTIONS = gnu no-dependencies
+M4DIR = $(srcdir)/m4
+ACLOCAL_AMFLAGS = -I $(M4DIR)
 
 DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"