diff --git a/ChangeLog b/ChangeLog
index bf8516b95ee..9b233e1988c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11525,4 +11525,6 @@
 	  using the FAT file system's internal sector buffers (2016-02-22).
 	* drivers/wireless/ieee802154: New directory.  Nothing there yet (2016-02-25).
 	* wireless/: New top level directory.  Nothing there yet (2015-02-26).
+	* wireless/ieee802154: Add an new directory to the build.  Nothing there
+	  yet (2016-02-26).
 
diff --git a/drivers/wireless/Make.defs b/drivers/wireless/Make.defs
index be63caaa765..6322a5c0b03 100644
--- a/drivers/wireless/Make.defs
+++ b/drivers/wireless/Make.defs
@@ -37,7 +37,7 @@ ifeq ($(CONFIG_DRIVERS_WIRELESS),y)
 
 # Include IEEE 802.15.4 support
 
-ifeq ($(CONFIG_IEEE802154),y)
+ifeq ($(CONFIG_DRIVERS_IEEE802154),y)
 include wireless$(DELIM)ieee802154$(DELIM)Make.defs
 endif
 
diff --git a/drivers/wireless/ieee802154/Make.defs b/drivers/wireless/ieee802154/Make.defs
index b0eda57ca21..7c72f907db8 100644
--- a/drivers/wireless/ieee802154/Make.defs
+++ b/drivers/wireless/ieee802154/Make.defs
@@ -35,7 +35,7 @@
 
 # Include nothing if IEEE 802.15.4 is disabled
 
-ifeq ($(CONFIG_IEEE802154),y)
+ifeq ($(CONFIG_DRIVERS_IEEE802154),y)
 
 # Include common IEEE 802.15.4
 
@@ -47,4 +47,4 @@ DEPPATH += --dep-path wireless$(DELIM)ieee802154
 VPATH += :wireless$(DELIM)ieee802154
 CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154}
 
-endif # CONFIG_IEEE802154
+endif # CONFIG_DRIVERS_IEEE802154
diff --git a/wireless/Kconfig b/wireless/Kconfig
index ed6a31377b5..440e30a665c 100644
--- a/wireless/Kconfig
+++ b/wireless/Kconfig
@@ -12,4 +12,6 @@ config WIRELESS
 
 if WIRELESS
 
+source wireless/ieee802154/Kconfig
+
 endif # WIRELESS
diff --git a/wireless/Makefile b/wireless/Makefile
index dd8dde282af..85f69bd118f 100644
--- a/wireless/Makefile
+++ b/wireless/Makefile
@@ -40,11 +40,18 @@ ifeq ($(WINTOOL),y)
 INCDIROPT = -w
 endif
 
+# Add files to the build
+
 DEPPATH = --dep-path .
+
 ASRCS =
 CSRCS =
 VPATH = .
 
+# Add IEEE 802.15.4 files to the build
+
+include ieee802154$(DELIM)Make.defs
+
 # Include support for various drivers.  Each Make.defs file will add its
 # files to the source file list, add its DEPPATH info, and will add
 # the appropriate paths to the VPATH variable
diff --git a/wireless/ieee802154/Kconfig b/wireless/ieee802154/Kconfig
new file mode 100644
index 00000000000..18d5a8753c3
--- /dev/null
+++ b/wireless/ieee802154/Kconfig
@@ -0,0 +1,15 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config IEEE802154
+	bool "IEEE 802.15.4 Wireless Support"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		Enables support for the IEEE 802.14.5Wireless library.
+
+if IEEE802154
+
+endif # IEEE802154
diff --git a/wireless/ieee802154/Make.defs b/wireless/ieee802154/Make.defs
new file mode 100644
index 00000000000..9e0c66391b4
--- /dev/null
+++ b/wireless/ieee802154/Make.defs
@@ -0,0 +1,46 @@
+############################################################################
+# wireless/ieee802145/Make.defs
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_IEEE802154),y)
+
+# Include IEEE 802.15.4 support
+
+# Include wireless devices build support
+
+DEPPATH += --dep-path wireless/ieee802154
+VPATH += :wireless/ieee802154
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)ieee802154}
+
+endif # CONFIG_IEEE802154