diff --git a/Makefile.am b/Makefile.am
index bcc7f94..ca07f02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,9 +16,7 @@ libcriterion_la_CFLAGS = \
 	$(COVERAGE_CFLAGS)
 
 libcriterion_la_LDFLAGS = $(COVERAGE_LDFLAGS)
-
-# dirty but unless someone has a better alternative...
-libcriterion_la_LIBADD = dependencies/csptr/src/libcsptr_la-*.lo
+libcriterion_la_LIBADD = -lcsptr
 
 EXTRA_DIST = config.rpath LICENSE
 
diff --git a/configure.ac b/configure.ac
index 836281f..4e3160f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ LT_PREREQ([2.2.4])
 AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign subdir-objects parallel-tests color-tests])
-LT_INIT([disable-shared])
+LT_INIT([disable-static])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_CC