diff --git a/.cvsignore b/.cvsignore
index 23b5eb79a2bc1f5593f6c105ef5bf8fedb90291d..8889db2dd6e1f7ffdb582f071fc6f926ce6a7079 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,5 +6,6 @@ config.h.in
 configure
 ltconfig
 ltmain.sh
+missing
 config.guess
 config.sub
diff --git a/Makefile.am b/Makefile.am
index e9b7d00966fcc5b4bf29a867c49236902dbb1e54..64752cde936c66ddc2db98027de326ce8caae67e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
 # See the file COPYING for details.
 
 AUTOMAKE_OPTIONS = foreign 1.7
-lib_LTLIBRARIES = liboop-adns.la liboop-glib.la liboop-glib2.la liboop-tcl.la liboop-www.la liboop-rl.la liboop.la
+lib_LTLIBRARIES = liboop-adns.la liboop-glib2.la liboop-glib.la liboop-tcl.la liboop-www.la liboop-rl.la liboop.la
 
 # versions updated as of 0.8
 liboop_la_LDFLAGS = -version-info 4:0:0 # version:revision:age
@@ -46,6 +46,7 @@ include_HEADERS = oop.h oop-adns.h oop-glib.h oop-tcl.h oop-www.h oop-rl.h oop-r
 noinst_PROGRAMS = test-oop
 
 test_oop_SOURCES = test-oop.c
+test_oop_CFLAGS = $(GLIB2_CFLAGS) $(GLIB_INCLUDES) $(TCL_INCLUDES) $(WWW_INCLUDES)
 test_oop_LDADD = $(lib_LTLIBRARIES)
 
 release: dist
diff --git a/bootstrap b/bootstrap
index 0a310630390fd80276c490a77a7148b7d8c3f019..2ae99003ab725f05009c94f08ef0377e4bef8a91 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,8 @@
 #!/bin/sh -x
 
+[ -x "`which automake-1.7 2>/dev/null`" ] && ver="-1.7" || ver=""
+
 libtoolize --copy --force &&
-aclocal &&
-automake --add-missing &&
+aclocal$ver &&
+automake$ver --add-missing &&
 autoconf