diff --git a/Makefile.am b/Makefile.am
index a6d99e1a..9bbe9ebf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.48 2008/06/13 15:54:49 flameeyes Exp $
+#   $Id: Makefile.am,v 1.49 2008/06/16 22:36:14 flameeyes Exp $
 #
 #   Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
 #
@@ -130,6 +130,6 @@ if MAINTAINER_MODE
 ChangeLog:
 	( cd $(srcdir); $(CVS2CL) -W 450 --header cvs2cl_header --utc -w -I ChangeLog --usermap cvs2cl_usermap -P --stdout ) > ChangeLog
 
-ACLOCAL_AMFLAGS=-I .
+ACLOCAL_AMFLAGS=-I m4
 
 endif
diff --git a/configure.ac b/configure.ac
index e07f1872..cb5e0d26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ define(RELEASE_NUM, 81)
 define(CDIO_VERSION_STR, 0.$1cvs)
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.228 2008/06/14 22:41:29 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.229 2008/06/16 22:36:09 flameeyes Exp $])dnl
 AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
 AC_CONFIG_SRCDIR(src/cd-info.c)
 
@@ -32,6 +32,7 @@ AM_INIT_AUTOMAKE([1.7])
 
 AC_CANONICAL_HOST
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 
 LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
 AC_SUBST(LIBCDIO_VERSION_NUM)