diff --git a/lib/libbind/Makefile b/lib/libbind/Makefile
index acfa4854963a..250157b1a244 100644
--- a/lib/libbind/Makefile
+++ b/lib/libbind/Makefile
@@ -20,9 +20,46 @@ SRCS+=	dns.c dns_gr.c dns_ho.c dns_nw.c dns_pr.c dns_pw.c dns_sv.c gen.c \
 	nis_ng.c nis_nw.c nis_pr.c nis_pw.c nis_sv.c nul_ng.c util.c
 .endif
 
+.if defined(WANT_CYLINK) && exists(${BIND_DIR}/lib/cylink)
+.PATH:	${BIND_DIR}/lib/cylink
+CFLAGS+=-DCYLINK_DSS -I${BIND_DIR}/lib/cylink
+SRCS+=	bn.c bn00.c lbn00.c lbnmem.c legal.c \
+	bits.c dss.c math.c ctk_prime.c rand.c sha.c swap.c
+.endif
+
+.if defined(WANT_DNSSAFE) && exists(${BIND_DIR}/lib/dnssafe)
+.PATH:	${BIND_DIR}/lib/dnssafe
+CFLAGS+=-DDNSSAFE -I${BIND_DIR}/lib/dnssafe
+SRCS+=	bgclrbit.c bgmdmpyx.c bgmdsqx.c bgmodexp.c \
+	bgpegcd.c big2exp.c bigabs.c bigacc.c bigarith.c \
+	bigcmp.c bigconst.c biginv.c biglen.c bigmodx.c \
+	bigmpy.c bigpdiv.c bigpmpy.c bigpmpyh.c bigpmpyl.c \
+	bigpsq.c bigqrx.c bigsmod.c bigtocan.c bigu.c \
+	bigunexp.c cantobig.c crt2.c \
+	digrand.c intbits.c md5.c md5rand.c prime.c \
+	rsa.c rsakeygn.c seccbcd.c seccbce.c surrendr.c \
+	ahchdig.c ahchencr.c ahchgen.c ahchrand.c ahdigest.c \
+	ahencryp.c ahgen.c ahrandom.c ahrsaenc.c ahrsaepr.c \
+	ahrsaepu.c aichdig.c aichenc8.c aichencn.c aichencr.c \
+	aichgen.c aichrand.c aimd5.c \
+	aimd5ran.c ainfotyp.c ainull.c airsaepr.c airsaepu.c \
+	airsakgn.c airsaprv.c airsapub.c algchoic.c algobj.c \
+	amcrte.c ammd5.c ammd5r.c \
+	amrkg.c amrsae.c balg.c binfocsh.c bkey.c bmempool.c \
+	digest.c encrypt.c generate.c intitem.c \
+	keyobj.c ki8byte.c kiitem.c kinfotyp.c \
+	kifulprv.c kipkcrpr.c kirsacrt.c kirsapub.c random.c
+.endif
+
+.PATH:	${BIND_DIR}/lib/dst
+CFLAGS+=-DHMAC_MD5 -DUSE_MD5
+SRCS+=	dst_api.c prandom.c rsaref_link.c support.c bsafe_link.c \
+	cylink_link.c hmac_link.c md5_dgst.c eay_dss_link.c
+
 .PATH:	${BIND_DIR}/lib/isc
 SRCS+=	tree.c bitncmp.c assertions.c \
 	memcluster.c logging.c heap.c \
+	ctl_p.c ctl_srvr.c ctl_clnt.c \
 	eventlib.c ev_connects.c ev_files.c \
 	ev_timers.c ev_streams.c ev_waits.c
 #	base64.c