diff --git a/ChangeLog b/ChangeLog
index ce516aef..97323421 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,8 +27,6 @@ CVS code -
 	- 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 e07c26d5..921a2024 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
 ## $Id$
 AUTOMAKE_OPTIONS = gnu no-dependencies
-M4DIR = $(srcdir)/m4
-ACLOCAL_AMFLAGS = -I $(M4DIR)
 
 DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"