diff --git a/Makefile.am b/Makefile.am
index 7a5cd57..ee21607 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ lib_LIBRARIES = libstrophe.a
 endif
 
 libstrophe_a_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS)
+libstrophe_a_include_HEADERS = strophe.h
 libstrophe_a_SOURCES = src/auth.c src/conn.c src/ctx.c \
 	src/event.c src/handler.c src/hash.c \
 	src/jid.c src/md5.c src/sasl.c src/sha1.c \
diff --git a/bootstrap.sh b/bootstrap.sh
index c546bd9..8f69caa 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-aclocal -I /usr/local/share/aclocal
+aclocal
 automake --add-missing --foreign --copy
 autoconf
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 6400010..d255670 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@ AM_INIT_AUTOMAKE
 
 AC_PROG_CC
 AC_PROG_RANLIB
+AM_PROG_CC_C_O
 
 AC_CHECK_HEADER(openssl/ssl.h, [], [AC_MSG_ERROR([couldn't find openssl headers, openssl required])])
 PKG_CHECK_MODULES([check], [check >= 0.9.4])