diff --git a/configs b/configs
index 3f48fbde14..45657b1172 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 3f48fbde14b07c116c06411209767def1056a9bb
+Subproject commit 45657b1172f9cfe6bf72e6313eb98e2cce78ee39
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 3493d02c00..bef5458d4a 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -373,17 +373,6 @@ if IOEXPANDER
 source drivers/ioexpander/Kconfig
 endif # IOEXPANDER
 
-menuconfig IEEE802154
-	bool "IEEE 802.15.4 Device Support"
-	default n
-	depends on EXPERIMENTAL
-	---help---
-		This directory holds implementations of IEEE802.15.4 device drivers.
-
-if IEEE802154
-source drivers/ieee802154/Kconfig
-endif
-
 menuconfig LCD
 	bool "LCD Driver Support"
 	default n
diff --git a/drivers/Makefile b/drivers/Makefile
index e741dd116e..025444990f 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -54,7 +54,6 @@ include audio$(DELIM)Make.defs
 include bch$(DELIM)Make.defs
 include i2c$(DELIM)Make.defs
 include input$(DELIM)Make.defs
-include ieee802154$(DELIM)Make.defs
 include ioexpander$(DELIM)Make.defs
 include lcd$(DELIM)Make.defs
 include leds$(DELIM)Make.defs
diff --git a/drivers/wireless/Kconfig b/drivers/wireless/Kconfig
index b55b9d5756..45d0c2b54d 100644
--- a/drivers/wireless/Kconfig
+++ b/drivers/wireless/Kconfig
@@ -15,6 +15,17 @@ menuconfig WL_CC3000
 
 source drivers/wireless/cc3000/Kconfig
 
+menuconfig IEEE802154
+	bool "IEEE 802.15.4 Device Support"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		This directory holds implementations of IEEE802.15.4 device drivers.
+
+if IEEE802154
+source drivers/wireless/ieee802154/Kconfig
+endif
+
 config WL_NRF24L01
 	bool "nRF24l01+ transceiver support"
 	default n
diff --git a/drivers/wireless/Make.defs b/drivers/wireless/Make.defs
index 235e09a672..23dcbdb8c8 100644
--- a/drivers/wireless/Make.defs
+++ b/drivers/wireless/Make.defs
@@ -35,6 +35,12 @@
 
 ifeq ($(CONFIG_WIRELESS),y)
 
+# Include IEEE 802.15.4 support
+
+ifeq ($(CONFIG_IEEE802154),y)
+include wireless$(DELIM)ieee802154$(DELIM)Make.defs
+endif
+
 # Include wireless drivers
 
 ifeq ($(CONFIG_WL_CC1101),y)
diff --git a/drivers/ieee802154/Kconfig b/drivers/wireless/ieee802154/Kconfig
similarity index 100%
rename from drivers/ieee802154/Kconfig
rename to drivers/wireless/ieee802154/Kconfig
diff --git a/drivers/ieee802154/Make.defs b/drivers/wireless/ieee802154/Make.defs
similarity index 91%
rename from drivers/ieee802154/Make.defs
rename to drivers/wireless/ieee802154/Make.defs
index 88c20db518..b0eda57ca2 100644
--- a/drivers/ieee802154/Make.defs
+++ b/drivers/wireless/ieee802154/Make.defs
@@ -43,7 +43,8 @@ ifeq ($(CONFIG_IEEE802154),y)
 
 # Include IEEE 802.15.4 build support
 
-DEPPATH += --dep-path ieee802154
-VPATH += :ieee802154
+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
diff --git a/include/nuttx/net/ieee802154.h b/include/nuttx/net/6lowpan.h
similarity index 76%
rename from include/nuttx/net/ieee802154.h
rename to include/nuttx/net/6lowpan.h
index 1ac577cea2..4c9d7a85e1 100644
--- a/include/nuttx/net/ieee802154.h
+++ b/include/nuttx/net/6lowpan.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/net/ieee802154.h
+ * include/nuttx/net/6lowpan.h
  * Definitions for use with PF_IEEE802154 sockets
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
@@ -37,8 +37,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_NET_IEEE802154_H
-#define __INCLUDE_NUTTX_NET_IEEE802154_H
+#ifndef __INCLUDE_NUTTX_NET_6LOWPAN_H
+#define __INCLUDE_NUTTX_NET_6LOWPAN_H
 
 /****************************************************************************
  * Included Files
@@ -60,23 +60,4 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-/****************************************************************************
- * Name: ieee802154_input
- *
- * Description:
- *   This function provides the interface between IEEE 802.15.4 device driver
- *   and IEEE 802.15.4 socket logic.  All IPv6 frames that are received should
- *   be provided to ieee802154_input().
- *
- * Input Parameters:
- *   dev - The device providing the IPv6 frame
- *
- * Returned Value:
- *    OK  The packet has been processed and can be deleted.
- *
- ****************************************************************************/
-
-struct net_driver_s; /* Forward reference */
-int ieee802154_input(FAR struct net_driver_s *dev);
-
-#endif /* __INCLUDE_NUTTX_NET_IEEE802154_H */
+#endif /* __INCLUDE_NUTTX_NET_6LOWPAN_H */
diff --git a/net/netdev/netdev_rxnotify.c b/net/netdev/netdev_rxnotify.c
index 187ca6c05e..be7aed64d0 100644
--- a/net/netdev/netdev_rxnotify.c
+++ b/net/netdev/netdev_rxnotify.c
@@ -104,7 +104,7 @@ void netdev_ipv4_rxnotify(in_addr_t ripaddr)
  *
  * Description:
  *   Notify the device driver that forwards the IPv6 address that the
- *  application waits for RX data.
+ *   application waits for RX data.
  *
  * Parameters:
  *   lipaddr - The local board IPv6 address of the socket