diff --git a/tools/bsdbox/Makefile.hostapd b/tools/bsdbox/Makefile.hostapd
--- a/tools/bsdbox/Makefile.hostapd
+++ b/tools/bsdbox/Makefile.hostapd
@@ -9,9 +9,9 @@
 
 CRUNCH_KEEP_hostapd+=	wpa_driver_bsd_ops
 
-#CRUNCH_PROGS_usr.sbin+=	wpa_supplicant wpa_cli
-#CRUNCH_SRCDIR_wpa_supplicant=	$(.CURDIR)/../../usr.sbin/wpa/wpa_supplicant
-#CRUNCH_SRCDIR_wpa_cli=	$(.CURDIR)/../../usr.sbin/wpa/wpa_cli
+CRUNCH_PROGS_usr.sbin+=	wpa_supplicant wpa_cli
+CRUNCH_SRCDIR_wpa_supplicant=	$(.CURDIR)/../../usr.sbin/wpa/wpa_supplicant
+CRUNCH_SRCDIR_wpa_cli=	$(.CURDIR)/../../usr.sbin/wpa/wpa_cli
 
 .if ${MK_OFED} != "no"
 # libpcap dependencies if OFED is enabled
@@ -19,10 +19,14 @@
 .endif
 CRUNCH_LIBS+=	-lpcap
 
+# hostapd
 wpalibs=	drivers ap l2_packet eap_server
 wpalibs+=	eapol_auth eap_common
 wpalibs+=	radius tls wps common crypto utils
 
+# wpa_supplicant
+wpalibs+=	eapol_supp eap_peer rsn_supp
+
 .for wpalib in ${wpalibs}
 CRUNCH_LIBS+=	${LIBWPA${wpalib:tu}}
 .endfor