diff --git a/ChangeLog b/ChangeLog
index dfe62d6371..9646fc40dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5874,3 +5874,6 @@
 	* arch/arm/src/sama5/sam_adc.c, sam_tc.c and sam_tc.h:  Hook in the
 	  timer/counter logic so that it can driver periodic ADC sampling
 	  (2013-10-24).
+	* configs/freedom-kl25z/src/Makefile:  Only build kl_wifi.c if
+	  CONFIG_WL_CC3000 is selected.  From Alan Carvalho de Assis
+	  (2013-10-24).
diff --git a/configs/freedom-kl25z/src/Makefile b/configs/freedom-kl25z/src/Makefile
index 3c6ac3694b..1171413220 100644
--- a/configs/freedom-kl25z/src/Makefile
+++ b/configs/freedom-kl25z/src/Makefile
@@ -40,7 +40,11 @@ CFLAGS += -I$(TOPDIR)/sched
 ASRCS = 
 AOBJS = $(ASRCS:.S=$(OBJEXT))
 
-CSRCS = kl_boardinitialize.c kl_wifi.c
+CSRCS = kl_boardinitialize.c
+
+ifeq ($(CONFIG_WL_CC3000),y)
+CSRCS += kl_wifi.c
+endif
 
 ifeq ($(CONFIG_KL_TSI),y)
 CSRCS += kl_tsi.c