diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am
index 3965bbd15..ca2aab1fe 100644
--- a/kpasswd/Makefile.am
+++ b/kpasswd/Makefile.am
@@ -6,4 +6,8 @@ INCLUDES = -I$(top_builddir)/include
 
 bin_PROGRAMS = kpasswd
 
+libexec_PROGRAMS = kpasswdd
+
+kpasswdd_LDADD = -L$(top_builddir)/lib/hdb -lhdb $(LDADD)
+
 LDADD = -L$(top_builddir)/lib/krb5  -lkrb5 -L$(top_builddir)/lib/des -ldes -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/roken -lroken