diff --git a/ChangeLog b/ChangeLog
index 1fcccfb3af..027d1639cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5850,4 +5850,8 @@
 	  (2013-10-23).
 	* include/nuttx/wireless/cc3000:  More CC3000 driver updates from David
 	  Sidrane (2013-10-23).
+	* net/Kconfig, drivers/net/wireless/cc3000/Kconfig, and Kconfig:  Add
+	  ARCH_HAVE_NET that determines if a network is present or not.  This
+	  currently can happen if CONFIG_NET is set or if CONFIG_WL_CC3000 is
+	  is set (23013-10-23).
 
diff --git a/Kconfig b/Kconfig
index 15a9788d04..06cddace3e 100644
--- a/Kconfig
+++ b/Kconfig
@@ -352,7 +352,7 @@ config DEBUG_PAGING
 config DEBUG_NET
 	bool "Network Debug Output"
 	default n
-	depends on NET
+	depends on ARCH_HAVE_NET
 	---help---
 		Enable network debug SYSLOG output (disabled by default)
 
diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt
index 6199e2c5d1..7d5cf89575 100644
--- a/configs/sama5d3x-ek/README.txt
+++ b/configs/sama5d3x-ek/README.txt
@@ -716,7 +716,7 @@ CAN Usage
   common.
 
                     +----------+     RJ-11       DB-9
-                    |    O     |     ----------- -------------- 
+                    |    O     |     ----------- --------------
   +------------+    |          |     Pin 1 3v3   Pin 1 N/C
   |    +--+    |    |  o5      |     Pin 2 5v    Pin 2 CANL
   |    |  |    |    |       o9 |     Pin 3 N/C   Pin 3 GND
diff --git a/drivers/wireless/cc3000/Kconfig b/drivers/wireless/cc3000/Kconfig
index 6e71a9af18..44b2857289 100644
--- a/drivers/wireless/cc3000/Kconfig
+++ b/drivers/wireless/cc3000/Kconfig
@@ -7,6 +7,7 @@ config WL_CC3000
 	bool "CC3000 Wireless Module"
 	default n
 	select SPI
+	select ARCH_HAVE_NET
 	---help---
 		Enable support for the TI CC3000 Wifi Module
 
diff --git a/net/Kconfig b/net/Kconfig
index 719f837d03..1a1d1e8e6c 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -3,14 +3,20 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config NET
-	bool "Networking support"
+config ARCH_HAVE_NET
+	bool
 	default n
-	---help---
-		Enable or disable all network features
 
 config ARCH_HAVE_PHY
 	bool
+	default n
+
+config NET
+	bool "Networking support"
+	default n
+	select ARCH_HAVE_NET
+	---help---
+		Enable or disable all network features
 
 if NET