---
 Makefile.am     |    2 ++
 doc/Makefile.am |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

--- Makefile.am.orig
+++ Makefile.am
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = m4 include vq lib examples test doc
 
 m4datadir = $(datadir)/aclocal
--- doc/Makefile.am.orig
+++ doc/Makefile.am
@@ -44,7 +44,6 @@
 	hufftree-under.png \
 	residue-pack.png \
 	residue2.png \
-	white-xifish.png \
 	window1.png \
 	window2.png
 SPEC_PDF = xifish.pdf