--- Makefile.am
+++ Makefile.am
@@ -5,21 +5,7 @@ SUBDIRS = intl po lib doc src tests m4 v
 
 EXTRA_DIST = TODO README README-alpha
 
-# We should be able to just define `ACLOCAL_AMFLAGS = --acdir=m4',
-# but this runs afoul of a bug in automake 1.
-# The following hack works around this bug by creating acinclude.m4 manually.
-ACLOCAL_AMFLAGS =
-M4DIR = $(srcdir)/m4
-ACINCLUDE_INPUTS = $(M4DIR)/decl.m4 $(M4DIR)/djgpp.m4 $(M4DIR)/dosfile.m4 \
-  $(M4DIR)/envsep.m4 $(M4DIR)/error.m4 $(M4DIR)/gettext.m4 $(M4DIR)/glibc.m4 \
-  $(M4DIR)/header.m4 $(M4DIR)/init.m4 $(M4DIR)/install.m4 \
-  $(M4DIR)/inttypes_h.m4 $(M4DIR)/isc-posix.m4 $(M4DIR)/largefile.m4 \
-  $(M4DIR)/lcmessage.m4 $(M4DIR)/malloc.m4 $(M4DIR)/mbstate_t.m4 \
-  $(M4DIR)/missing.m4 $(M4DIR)/progtest.m4 $(M4DIR)/realloc.m4 \
-  $(M4DIR)/regex.m4 $(M4DIR)/sanity.m4 $(M4DIR)/strerror_r.m4 \
-  $(M4DIR)/uintmax_t.m4 $(M4DIR)/ulonglong.m4 $(M4DIR)/xstrtoumax.m4
-$(srcdir)/acinclude.m4 : $(ACINCLUDE_INPUTS)
-	cat $(ACINCLUDE_INPUTS) >$(srcdir)/acinclude.m4
+ACLOCAL_AMFLAGS = -I m4
 
 # make cvs-clean blatantly stolen from KDE CVS ;)
 cvs-clean:
--- lib/Makefile.am
+++ lib/Makefile.am
@@ -15,6 +15,6 @@ libgreputils_a_SOURCES = \
 libgreputils_a_LIBADD = @LIBOBJS@ @ALLOCA@
 noinst_HEADERS = \
   closeout.h error.h exclude.h fnmatch.h getopt.h \
-  hard-locale.h obstack.h quotearg.h regex.h savedir.h xalloc.h xstrtol.h
+  hard-locale.h obstack.h quotearg.h savedir.h xalloc.h xstrtol.h
 
 EXTRA_DIST = strtol.c malloc.c realloc.c