--- usr.sbin/wpa/wpa_cli/Makefile.orig	2009-08-25 02:50:02.796905000 +0900
+++ usr.sbin/wpa/wpa_cli/Makefile	2010-08-17 01:28:30.020404507 +0900
@@ -9,6 +9,9 @@
 
 MAN=	wpa_cli.8
 
+CFLAGS+= -DCONFIG_EAP
+CFLAGS+= -DCONFIG_WPS
+#FLAGS+= -DCONFIG_DRIVER_WEXT
 CFLAGS+= -DCONFIG_CTRL_IFACE
 CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
 # enable use of d_type to identify unix domain sockets
--- usr.sbin/wpa/wpa_supplicant/Makefile.orig	2009-08-25 02:50:02.804905000 +0900
+++ usr.sbin/wpa/wpa_supplicant/Makefile	2010-08-17 01:28:35.801351258 +0900
@@ -4,6 +4,7 @@
 
 .PATH.c:${WPA_SUPPLICANT_DISTDIR} \
 	${WPA_DISTDIR}/src/drivers \
+	${WPA_DISTDIR}/src/wps \
 	${WPA_DISTDIR}/src/eap_peer \
 	${WPA_DISTDIR}/src/rsn_supp
 
@@ -29,8 +30,11 @@
 CFLAGS+=-I${WPA_DISTDIR}/src/drivers
 CFLAGS+=-I${WPA_DISTDIR}/src/rsn_supp
 
+CFALGS+= -DCONFIG_EAP
+CFLAGS+= -DCONFIG_WPS
 CFLAGS+= -DCONFIG_DRIVER_BSD
 CFLAGS+= -DCONFIG_DRIVER_NDIS
+#FLAGS+= -DCONFIG_DRIVER_WEXT
 CFLAGS+= -DCONFIG_DRIVER_WIRED
 CFLAGS+= -DCONFIG_TERMINATE_ONLASTIF
 CFLAGS+= -DCONFIG_DEBUG_SYSLOG
@@ -84,6 +88,11 @@
 SRCS+=	eap_sim.c
 .endif
 
+.if !empty(CFLAGS:M*-DCONFIG_WPS)
+NEED_SHA256=		true
+SRCS+=	wps_supplicant.c wps_common.c wps_registrar.c wps_dev_attr.c wps_attr_parse.c wps_attr_process.c wps_attr_build.c wps_enrollee.c wps.c dh_groups.c uuid.c
+.endif
+
 .if defined(NEED_SIM_COMMON)
 SRCS+=	eap_sim_common.c