diff --git a/sys/modules/wtap/Makefile b/sys/modules/wtap/Makefile
index 4386bf0dd7ad..d8ec70a2d3f0 100644
--- a/sys/modules/wtap/Makefile
+++ b/sys/modules/wtap/Makefile
@@ -1,27 +1,24 @@
 # $FreeBSD$
 
+KMOD=	wtap
 
-# Declare Name of kernel module
-KMOD	=  wtap
-
-# Enumerate Source files for kernel module
 .PATH:	${SRCTOP}/sys/dev/wtap
-SRCS	=  if_wtap_module.c if_wtap.c if_medium.c
+SRCS=	if_wtap_module.c if_wtap.c if_medium.c
 
 .PATH:	${SRCTOP}/sys/dev/wtap/wtap_hal
-SRCS	+= hal.c
+SRCS+=	hal.c
 
 .PATH:	${SRCTOP}/sys/dev/wtap/plugins
-SRCS	+= visibility.c
+SRCS+=	visibility.c
 
-SRCS	+= opt_global.h
+SRCS+=	opt_wlan.h opt_global.h
 
 .if !defined(KERNBUILDDIR)
-CFLAGS+=        -include opt_global.h
-
+.if defined(VIMAGE)
 opt_global.h:
-	echo "#define VIMAGE 1" > ${.TARGET}
+	echo "#define VIMAGE 1" >> ${.TARGET}
+CFLAGS+=	-include opt_global.h
+.endif
 .endif
 
-# Include kernel module makefile
 .include <bsd.kmod.mk>