diff --git a/tool/Makefile.am b/tool/Makefile.am
index b41525c..6a46735 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -26,12 +26,14 @@
 
 AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = $(OPENSSL_CFLAGS) $(PCSC_CFLAGS)
+AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_builddir)/lib
 
 bin_PROGRAMS = yubico-piv-tool
 yubico_piv_tool_SOURCES = yubico-piv-tool.c yubico-piv-tool.h2m
 yubico_piv_tool_SOURCES += cmdline.ggo cmdline.c cmdline.h
 yubico_piv_tool_LDADD = $(OPENSSL_LIBS) $(PCSC_LIBS)
 yubico_piv_tool_LDADD += $(LTLIBWINSCARD) $(PCSC_MACOSX_LIBS)
+yubico_piv_tool_LDADD += ../lib/libykpiv.la
 
 cmdline.c cmdline.h: cmdline.ggo Makefile.am
 	gengetopt --input $^