diff --git a/fs/procfs/fs_procfs.c b/fs/procfs/fs_procfs.c
index b350809c97..4f9f2de518 100644
--- a/fs/procfs/fs_procfs.c
+++ b/fs/procfs/fs_procfs.c
@@ -60,7 +60,7 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/procfs.h>
 #include <nuttx/fs/dirent.h>
-#include <nuttx/regex.h>
+#include <nuttx/lib/regex.h>
 
 #if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FS_PROCFS)
 
diff --git a/include/nuttx/regex.h b/include/nuttx/lib/regex.h
similarity index 93%
rename from include/nuttx/regex.h
rename to include/nuttx/lib/regex.h
index e26eed9140..660058c6cc 100644
--- a/include/nuttx/regex.h
+++ b/include/nuttx/lib/regex.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * include/nuttx/regex.h
+ * include/nuttx/lib/regex.h
  * Non-standard, pattern-matching APIs available in lib/.
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_REGEX_H
-#define __INCLUDE_NUTTX_REGEX_H
+#ifndef __INCLUDE_NUTTX_LIB_REGEX_H
+#define __INCLUDE_NUTTX_LIB_REGEX_H
 
 /****************************************************************************
  * Included Files
@@ -80,4 +80,4 @@ int match(const char *pattern, const char *string);
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_REGEX_H */
+#endif /* __INCLUDE_NUTTX_LIB_REGEX_H */
diff --git a/libc/libc.csv b/libc/libc.csv
index 9a385a215b..86bf8d126c 100644
--- a/libc/libc.csv
+++ b/libc/libc.csv
@@ -64,7 +64,7 @@
 "lib_dumpbuffer","debug.h","","void","FAR const char *","FAR const uint8_t *","unsigned int"
 "lio_listio","aio.h","defined(CONFIG_FS_AIO)","int","int","FAR struct aiocb *const []|FAR struct aiocb *const *","int","FAR struct sigevent *"
 "llabs","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","long long int","long long int"
-"match","nuttx/regex.h","","int","const char *","const char *"
+"match","nuttx/lib/regex.h","","int","const char *","const char *"
 "memccpy","string.h","","FAR void","FAR void *","FAR const void *","int c","size_t"
 "memchr","string.h","","FAR void","FAR const void *","int c","size_t"
 "memcmp","string.h","","int","FAR const void *","FAR const void *","size_t"
diff --git a/libc/misc/lib_match.c b/libc/misc/lib_match.c
index 690d111a5c..2b3085d663 100644
--- a/libc/misc/lib_match.c
+++ b/libc/misc/lib_match.c
@@ -39,7 +39,7 @@
  ****************************************************************************/
 
 #include <string.h>
-#include <nuttx/regex.h>
+#include <nuttx/lib/regex.h>
 
 /****************************************************************************
  * Private Functions