diff --git a/Makefile.am b/Makefile.am
index 5165326..229c0ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,5 @@
 lib_LTLIBRARIES = libbthread.la
-libbthread_la_SOURCES = pt-cancel.c pt-docancel.c pt-init.c pt-setcancelstate.c pt-setcanceltype.c
+libbthread_la_SOURCES = pt-cancel.c pt-docancel.c pt-init.c pt-setcancelstate.c pt-setcanceltype.c pt-testcancel.c pt-internal.h
+include_HEADERS = bthread.h
+check_PROGRAMS = bthread-test
+bthread_test_SOURCES = pt-test.c
diff --git a/configure.ac b/configure.ac
index c39990a..9d19ea8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.69])
 AC_INIT([bthread], [0.2], [])
-AC_CONFIG_SRCDIR([pt-test.c])
+AC_CONFIG_SRCDIR([pt-cancel.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])