diff --git a/TODO b/TODO
index fe150357f3..090e12c2ac 100644
--- a/TODO
+++ b/TODO
@@ -2074,6 +2074,30 @@ o Build system
                see that the .a archive file has the newer time stamp and those .o
                file will never be added to the archive until the directory is cleaned
                or some other dependency changes.
+
+               UPDATE: There is another way that Control-C can break dependencies:
+               If you control-c out of the make during the apps/ part of the build,
+               the archive at apps/libapps.a is deleted.  You can see this in the
+               make outout, for example:
+
+                 CC:  ieee802154_getsaddr.c
+                 make[2]: *** [Makefile:104: ieee802154_getsaddr.o] Interrupt
+                 make: *** Deleting file '../apps/libapps.a'
+
+               When you rebuild the system, the first file archived will recreate
+               libapps.a and set the timestamp to the current time.  Then, none of
+               the other object files will be added to the archive because they are
+               all older.
+
+               The typical symptom of such an issue is a link time error like:
+
+                 LD: nuttx libsched.a(os_bringup.o): In function `os_bringup':
+                 os_bringup.c:(.text+0x34): undefined reference to `nsh_main'
+
+               The work-around for now is:
+
+                 $ make apps_distclean
+
    Status      Open
    Priority:   Medium-High.  It is a rare event that control-C happens at just the
                point in time.  However, when it does occur the resulting code may
diff --git a/configs/clicker2-stm32/README.txt b/configs/clicker2-stm32/README.txt
index 45b594399f..49b645204a 100644
--- a/configs/clicker2-stm32/README.txt
+++ b/configs/clicker2-stm32/README.txt
@@ -436,6 +436,23 @@ Configurations
 
          nsh> ifup wpan0
 
+    6. examples/udp is enabled.  This will allow two MRF24J40 nodes to
+       exchange UDP packets.  Basic instructions:
+
+       On the server node:
+
+         nsh> ifconfig wpan0
+         nsh> udpserver &
+
+       The ifconfig command will show the IP address of the server.  Then on
+       the client node use this IP address to start the client:
+
+         nsh> udpserver <server-ip> &
+
+       Where <server-ip> is the IP address of the server that you got above.
+       NOTE: There is no way to stop the UDP test once it has been started
+       other than by resetting the board.
+
   nsh:
 
     Configures the NuttShell (nsh) located at examples/nsh.  This
diff --git a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig
index a8ba381b69..9619d02170 100644
--- a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig
+++ b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig
@@ -1352,7 +1352,28 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
+CONFIG_EXAMPLES_UDP=y
+# CONFIG_EXAMPLES_UDP_SERVER1 is not set
+CONFIG_EXAMPLES_UDP_PRIORITY1=100
+CONFIG_EXAMPLES_UDP_STACKSIZE1=2048
+CONFIG_EXAMPLES_UDP_TARGET2=y
+CONFIG_EXAMPLES_UDP_PRIORITY2=100
+CONFIG_EXAMPLES_UDP_STACKSIZE2=2048
+CONFIG_EXAMPLES_UDP_DEVNAME="wpan0"
+# CONFIG_EXAMPLES_UDP_NETINIT is not set
+CONFIG_EXAMPLES_UDP_IPv6=y
+
+#
+# Server IPv6 address
+#
+CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_1=0xfe80
+CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_2=0x0000
+CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_3=0x0000
+CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_4=0x0000
+CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_5=0x0000
+CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_6=0x00ff
+CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_7=0xfe00
+CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_8=0x0d00
 # CONFIG_EXAMPLES_UDPBLASTER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index ad5207ab7f..fbaa76ca41 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -28,6 +28,7 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_MOTOROLA_SREC is not set
 CONFIG_RAW_BINARY=y
 # CONFIG_UBOOT_UIMAGE is not set
+# CONFIG_DFU_BINARY is not set
 
 #
 # Customize Header Files
@@ -123,7 +124,6 @@ CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="dm320"
-# CONFIG_ARCH_TOOLCHAIN_IAR is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_HAVE_TRUSTZONE is not set
@@ -149,6 +149,8 @@ CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y
 #
 CONFIG_DM320_UART0=y
 CONFIG_DM320_UART1=y
+# CONFIG_ARCH_TOOLCHAIN_IAR is not set
+# CONFIG_ARCH_TOOLCHAIN_GNU is not set
 
 #
 # Architecture Options
@@ -169,6 +171,7 @@ CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 # CONFIG_ARCH_HAVE_POWEROFF is not set
 # CONFIG_ARCH_HAVE_RESET is not set
+# CONFIG_ARCH_HAVE_RTC_SUBSECONDS is not set
 CONFIG_ARCH_USE_MMU=y
 # CONFIG_PAGING is not set
 # CONFIG_ARCH_STACKDUMP is not set
@@ -335,14 +338,6 @@ CONFIG_DEV_NULL=y
 #
 # Buffering
 #
-
-#
-# Common  I/O Buffer Support
-#
-CONFIG_MM_IOB=y
-CONFIG_IOB_NBUFFERS=8
-CONFIG_IOB_BUFSIZE=196
-CONFIG_IOB_NCHAINS=8
 # CONFIG_DRVR_WRITEBUFFER is not set
 # CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
@@ -504,7 +499,9 @@ CONFIG_UART1_2STOP=0
 # System Logging
 #
 # CONFIG_ARCH_SYSLOG is not set
+CONFIG_SYSLOG_WRITE=y
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_BUFFER is not set
 # CONFIG_SYSLOG_INTBUFFER is not set
 # CONFIG_SYSLOG_TIMESTAMP is not set
 CONFIG_SYSLOG_SERIAL_CONSOLE=y
@@ -653,6 +650,15 @@ CONFIG_MM_REGIONS=1
 # CONFIG_GRAN is not set
 # CONFIG_MM_PGALLOC is not set
 
+#
+# Common I/O Buffer Support
+#
+CONFIG_MM_IOB=y
+CONFIG_IOB_NBUFFERS=8
+CONFIG_IOB_BUFSIZE=196
+CONFIG_IOB_NCHAINS=8
+CONFIG_IOB_THROTTLE=0
+
 #
 # Audio Support
 #
@@ -661,6 +667,7 @@ CONFIG_MM_REGIONS=1
 #
 # Wireless Support
 #
+# CONFIG_WIRELESS is not set
 
 #
 # Binary Loader
@@ -837,7 +844,12 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 CONFIG_EXAMPLES_UDP=y
-# CONFIG_EXAMPLES_UDP_SERVER is not set
+# CONFIG_EXAMPLES_UDP_SERVER1 is not set
+CONFIG_EXAMPLES_UDP_PRIORITY1=100
+CONFIG_EXAMPLES_UDP_STACKSIZE1=2048
+# CONFIG_EXAMPLES_UDP_TARGET2 is not set
+CONFIG_EXAMPLES_UDP_DEVNAME="eth0"
+CONFIG_EXAMPLES_UDP_NETINIT=y
 CONFIG_EXAMPLES_UDP_IPv4=y
 
 #
@@ -916,10 +928,12 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_DHCPC is not set
 # CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_NTPC is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
@@ -932,3 +946,10 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # Wireless Libraries and NSH Add-Ons
 #
+
+#
+# IEEE 802.15.4 applications
+#
+# CONFIG_IEEE802154_LIBMAC is not set
+# CONFIG_IEEE802154_LIBUTILS is not set
+# CONFIG_IEEE802154_I8SAK is not set