diff --git a/configure.ac b/configure.ac
index 6619003..71f2489 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT(patchelf, "0.1")
 AC_CONFIG_SRCDIR(Makefile.am)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 
 # Change to `1' to produce a `stable' release (i.e., the `preREVISION'
 # suffix is not added).
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fc92ab3..bbffa02 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,3 +25,6 @@ bar.o: bar.c
 
 clean-local:
 	$(RM) *.o libfoo.so libbar.so main
+
+
+EXTRA_DIST = main.c foo.c bar.c $(TESTS)