diff --git a/ChangeLog.txt b/ChangeLog.txt
index cb9d30d0b..db39f1a84 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1612,4 +1612,6 @@
 	  be found in the 'Obsoleted' repository (2016-06-03).
 	* apps/fsutils/flash_eraseall: IOCTL wrapper for MDCIO_BULKERASE command
 	  (2016-06-04).
+	* apps/system/flash_eraseall: Restored!  Using the new IOCTL wrapper at
+	  apps/fsutils/flash_eraseall (2016-06-04).
 
diff --git a/system/Kconfig b/system/Kconfig
index ecf6b6317..fac8504fe 100644
--- a/system/Kconfig
+++ b/system/Kconfig
@@ -8,6 +8,7 @@ menu "System Libraries and NSH Add-Ons"
 source "$APPSDIR/system/free/Kconfig"
 source "$APPSDIR/system/cle/Kconfig"
 source "$APPSDIR/system/cu/Kconfig"
+source "$APPSDIR/system/flash_eraseall/Kconfig"
 source "$APPSDIR/system/install/Kconfig"
 source "$APPSDIR/system/hex2bin/Kconfig"
 source "$APPSDIR/system/i2c/Kconfig"
diff --git a/system/Make.defs b/system/Make.defs
index dd822d15a..73d964f30 100644
--- a/system/Make.defs
+++ b/system/Make.defs
@@ -50,6 +50,10 @@ ifeq ($(CONFIG_SYSTEM_CUTERM),y)
 CONFIGURED_APPS += system/cu
 endif
 
+ifeq ($(CONFIG_SYSTEM_FLASH_ERASEALL),y)
+CONFIGURED_APPS += system/flash_eraseall
+endif
+
 ifeq ($(CONFIG_SYSTEM_FREE),y)
 CONFIGURED_APPS += system/free
 endif
diff --git a/system/Makefile b/system/Makefile
index c62d8ea9d..3d4722e8d 100644
--- a/system/Makefile
+++ b/system/Makefile
@@ -37,7 +37,7 @@
 
 # Sub-directories containing system tasks/libraries
 
-SUBDIRS  = cdcacm cle composite cu free i2c hex2bin install
+SUBDIRS  = cdcacm cle composite cu free flash_eraseall i2c hex2bin install
 SUBDIRS += hexed lm75 mdio netdb nxplayer ramtest readline
 SUBDIRS += stackmonitor sudoku symtab ubloxmodem usbmonitor usbmsc vi
 SUBDIRS += zmodem zoneinfo
diff --git a/system/flash_eraseall/.gitignore b/system/flash_eraseall/.gitignore
new file mode 100644
index 000000000..83bd7b811
--- /dev/null
+++ b/system/flash_eraseall/.gitignore
@@ -0,0 +1,11 @@
+/Make.dep
+/.depend
+/.built
+/*.asm
+/*.rel
+/*.lst
+/*.sym
+/*.adb
+/*.lib
+/*.src
+/*.obj
diff --git a/system/flash_eraseall/Kconfig b/system/flash_eraseall/Kconfig
new file mode 100644
index 000000000..64ea620d2
--- /dev/null
+++ b/system/flash_eraseall/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 SYSTEM_FLASH_ERASEALL
+	bool "FLASH Erase-all Command"
+	default n
+	depends on MTD && NSH_BUILTIN_APPS && !BUILD_PROTECTED && !BUILD_KERNEL
+	---help---
+		Enable support for the FLASH eraseall tool.
+
+if SYSTEM_FLASH_ERASEALL
+endif
+
diff --git a/system/flash_eraseall/Makefile b/system/flash_eraseall/Makefile
new file mode 100644
index 000000000..d9e97e5d1
--- /dev/null
+++ b/system/flash_eraseall/Makefile
@@ -0,0 +1,151 @@
+############################################################################
+# apps/system/flash_eraseall/Makefile
+#
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013 Ken Pettit. All rights reserved.
+#   Author: Ken Pettit <pettitkd@gmail.com>
+#           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.
+#
+############################################################################
+
+# TODO, this makefile should run make under the app dirs, instead of
+# sourcing the Make.defs!
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+ifeq ($(WINTOOL),y)
+INCDIROPT = -w
+endif
+
+# Hello Application
+# TODO: appname can be automatically extracted from the directory name
+
+APPNAME = flash_eraseall
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = 1024
+
+ASRCS =
+CSRCS =
+MAINSRC = flash_eraseall.c
+
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
+MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
+
+SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
+OBJS = $(AOBJS) $(COBJS)
+
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+  OBJS += $(MAINOBJ)
+endif
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  BIN = ..\..\libapps$(LIBEXT)
+else
+ifeq ($(WINTOOL),y)
+  BIN = ..\\..\\libapps$(LIBEXT)
+else
+  BIN = ../../libapps$(LIBEXT)
+endif
+endif
+
+ifeq ($(WINTOOL),y)
+  INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}"
+else
+  INSTALL_DIR = $(BIN_DIR)
+endif
+
+CONFIG_XYZ_PROGNAME ?= flash_eraseall$(EXEEXT)
+PROGNAME = $(CONFIG_XYZ_PROGNAME)
+
+ROOTDEPPATH = --dep-path .
+
+# Common build
+
+VPATH =
+
+all: .built
+.PHONY: preconfig context depend clean distclean
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS) $(MAINOBJ): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+.built: $(OBJS)
+	$(call ARCHIVE, $(BIN), $(OBJS))
+	$(Q) touch .built
+
+ifeq ($(CONFIG_BUILD_KERNEL),y)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
+	@echo "LD: $(PROGNAME)"
+	$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)
+	$(Q) $(NM) -u  $(INSTALL_DIR)$(DELIM)$(PROGNAME)
+
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
+
+else
+install:
+
+endif
+
+preconfig:
+
+# Register application
+
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
+	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+
+context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
+else
+context:
+endif
+
+# Create dependencies
+
+.depend: Makefile $(SRCS)
+	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
+
+depend: .depend
+
+clean:
+	$(call DELFILE, .built)
+	$(call CLEAN)
+
+distclean: clean
+	$(call DELFILE, Make.dep)
+	$(call DELFILE, .depend)
+
+-include Make.dep
diff --git a/system/flash_eraseall/README.txt b/system/flash_eraseall/README.txt
new file mode 100644
index 000000000..0b90d7f22
--- /dev/null
+++ b/system/flash_eraseall/README.txt
@@ -0,0 +1,12 @@
+Flash Erase-all
+===============
+
+    Source: NuttX
+    Author: Ken Pettit
+    Date: 5 May 2013
+
+This application erases the FLASH of an MTD flash block.  It is simply
+a wrapper that calls the NuttX flash_eraseall interface.
+
+Usage:
+    flash_eraseall <flash_block_device>
diff --git a/system/flash_eraseall/flash_eraseall.c b/system/flash_eraseall/flash_eraseall.c
new file mode 100644
index 000000000..48896d563
--- /dev/null
+++ b/system/flash_eraseall/flash_eraseall.c
@@ -0,0 +1,71 @@
+/****************************************************************************
+ * apps/system/flash_eraseall/flash_eraseall.c
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013 Ken Pettit. All rights reserved.
+ *   Author: Ken Pettit <pettitkd@gmail.com>
+ *           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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+
+#include <apps/fsutils/flash_eraseall.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+#ifdef CONFIG_BUILD_KERNEL
+int main(int argc, FAR char *argv[])
+#else
+int flash_eraseall_main(int argc, char *argv[])
+#endif
+{
+  /* Argument given? */
+
+  if (argc < 2)
+    {
+      fprintf(stderr, "usage: flash_eraseall flash_block_device\n");
+      return -1;
+    }
+
+  /* Do the job */
+
+  flash_eraseall(argv[1]);
+
+  return 0;
+}