diff --git a/tool/Makefile.am b/tool/Makefile.am
index aee15e8..b815bbb 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -32,7 +32,7 @@ AM_CPPFLAGS = $(OPENSSL_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 $(top_srcdir)/configure.ac
+yubico_piv_tool_SOURCES = yubico-piv-tool.c yubico-piv-tool.h2m
 yubico_piv_tool_LDADD = $(OPENSSL_LIBS) $(top_builddir)/lib/libykpiv.la
 yubico_piv_tool_LDADD += libpiv_cmd.la libpiv_util.la
 
@@ -43,7 +43,7 @@ libpiv_cmd_la_CFLAGS =
 libpiv_util_la_SOURCES = util.c util.h
 libpiv_util_la_LIBADD = $(OPENSSL_LIBS)
 
-cmdline.c cmdline.h: cmdline.ggo Makefile.am
+cmdline.c cmdline.h: cmdline.ggo Makefile.am $(top_srcdir)/configure.ac
 	$(GENGETOPT) --input $^
 
 BUILT_SOURCES = cmdline.c cmdline.h
@@ -54,7 +54,7 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 dist_man_MANS = yubico-piv-tool.1
 MAINTAINERCLEANFILES += $(dist_man_MANS)
 
-yubico-piv-tool.1: $(yubico_piv_tool_SOURCES)
+yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) $(libpiv_cmd_la_SOURCES)
 	$(HELP2MAN) --no-info \
 		--name="Yubico PIV tool" \
 		--include=$(srcdir)/yubico-piv-tool.h2m \