diff --git a/include/stdio.h b/include/stdio.h
index 20994e22ffd..d2ab907c0ca 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -194,6 +194,7 @@ int    vdprintf(int fd, FAR const IPTR char *fmt, va_list ap);
 
 FAR char *tmpnam(FAR char *s);
 FAR char *tempnam(FAR const char *dir, FAR const char *pfx);
+int       remove(FAR const char *path);
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/libc/stdio/Make.defs b/libc/stdio/Make.defs
index 595a222b277..f308266d656 100644
--- a/libc/stdio/Make.defs
+++ b/libc/stdio/Make.defs
@@ -51,6 +51,7 @@ ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
 
 CSRCS += lib_rawinstream.c lib_rawoutstream.c lib_rawsistream.c
 CSRCS += lib_rawsostream.c
+CSRCS += lib_remove.c
 
 # And these depend upon both file descriptors and C streams
 
diff --git a/libc/stdio/lib_remove.c b/libc/stdio/lib_remove.c
new file mode 100644
index 00000000000..3c2c8e6d3f0
--- /dev/null
+++ b/libc/stdio/lib_remove.c
@@ -0,0 +1,89 @@
+/****************************************************************************
+ * libc/stdio/lib_remove.c
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
+ *
+ * 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 <sys/stat.h>
+#include <unistd.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: remove
+ *
+ * Description:
+ *   The remove() function causes the object denoted by path to be removed.
+ *   The function is equivalent to unlink() or rmdir().
+ *
+ * Input Parmeters:
+ *   path - A pointer to a file or directory to be removed.
+ *
+ * Returned Value:
+ *   0(OK) on success; -1(ERROR) on failure with errno set appropriately:
+ *
+ *   For returned errno values, see unlink or rmdir.
+ *
+ ****************************************************************************/
+
+int remove(FAR const char *path)
+{
+  struct stat buf;
+  int ret;
+
+  /* Check the kind of object pointed by path */
+
+  ret = stat(path, &buf);
+  if (ret != 0)
+    {
+      return ret;
+    }
+
+  /* Act according to the kind of object */
+
+  if (S_ISDIR(buf.st_mode))
+    {
+      return rmdir(path);
+    }
+  else
+    {
+      return unlink(path);
+    }
+}