diff --git a/lib/kyua/cli/Makefile b/lib/kyua/cli/Makefile
index d599927934e5..5caeab4d4749 100644
--- a/lib/kyua/cli/Makefile
+++ b/lib/kyua/cli/Makefile
@@ -2,6 +2,7 @@
 
 KYUA_LIB=	cli
 INTERNALLIB=
+LIBADD=		kyua_drivers kyua_engine kyua_model kyua_store kyua_utils
 CFLAGS+=	-DKYUA_CONFDIR=\"${KYUA_CONFDIR}\"		\
 		-DKYUA_DOCDIR=\"${KYUA_CONFDIR}\"		\
 		-DKYUA_MISCDIR=\"${KYUA_MISCDIR}\"		\
diff --git a/lib/kyua/drivers/Makefile b/lib/kyua/drivers/Makefile
index 67d2ea2e0156..adf9c0601269 100644
--- a/lib/kyua/drivers/Makefile
+++ b/lib/kyua/drivers/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 KYUA_LIB=	drivers
+LIBADD=		kyua_model kyua_engine kyua_store
 
 SRCS=	debug_test.cpp		\
 	list_tests.cpp		\
diff --git a/lib/kyua/engine/Makefile b/lib/kyua/engine/Makefile
index fdacd5ae6703..4f0c9053c692 100644
--- a/lib/kyua/engine/Makefile
+++ b/lib/kyua/engine/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 KYUA_LIB=	engine
+LIBADD=		lutok kyua_utils
 CFLAGS=		-DKYUA_ARCHITECTURE=\"${MACHINE_ARCH}\"	\
 		-DKYUA_PLATFORM=\"${MACHINE}\"
 
diff --git a/lib/kyua/model/Makefile b/lib/kyua/model/Makefile
index 1b3efd7cfc8f..d4a0b91587e7 100644
--- a/lib/kyua/model/Makefile
+++ b/lib/kyua/model/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 KYUA_LIB=	model
+LIBADD=		lutok
 
 SRCS=	context.cpp		\
 	exceptions.cpp		\
diff --git a/lib/kyua/store/Makefile b/lib/kyua/store/Makefile
index a96066cc26fd..39753691873e 100644
--- a/lib/kyua/store/Makefile
+++ b/lib/kyua/store/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 KYUA_LIB=	store
+LIBADD=		kyua_model kyua_utils sqlite3
 
 CFLAGS+=	-DKYUA_STOREDIR=\"${KYUA_STOREDIR}\"
 
diff --git a/lib/kyua/utils/Makefile b/lib/kyua/utils/Makefile
index 68388ca84c09..740b395d6951 100644
--- a/lib/kyua/utils/Makefile
+++ b/lib/kyua/utils/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 KYUA_LIB=	utils
+LIBADD=		lutok
 
 CFLAGS+=	-I${SRCTOP}/contrib/sqlite3
 CFLAGS+=	-DGDB=\"/usr/local/bin/gdb\"
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index cf833f9b5cee..ac16e1a87bf2 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -263,8 +263,12 @@ _DP_bsnmp=	crypto
 _DP_geom=	bsdxml sbuf
 _DP_cam=	sbuf
 _DP_kvm=	elf
-_DP_kyua_cli=	lutok kyua_utils
-_DP_kyua_store=	sqlite3
+_DP_kyua_cli=		kyua_drivers kyua_engine kyua_model kyua_store kyua_utils
+_DP_kyua_drivers=	kyua_model kyua_engine kyua_store
+_DP_kyua_engine=	lutok kyua_utils
+_DP_kyua_model=		lutok
+_DP_kyua_utils=		lutok
+_DP_kyua_store=		kyua_model kyua_utils sqlite3
 _DP_casper=	nv
 _DP_cap_dns=	nv
 _DP_cap_fileargs=	nv