diff --git a/Kconfig b/Kconfig
index b030aee96e..31f6f54629 100644
--- a/Kconfig
+++ b/Kconfig
@@ -339,10 +339,10 @@ config ARCH_MATH_H
 	default n
 	---help---
 		There is also a re-directing version of math.h in the source tree.
-		However, it resides out-of-the-way at include/nuttx/math.h because it
+		However, it resides out-of-the-way at include/nuttx/lib/math.h because it
 		conflicts too often with the system math.h. If ARCH_MATH_H=y is
 		defined, however, the top-level makefile will copy the redirecting
-		math.h header file from include/nuttx/math.h to include/math.h. math.h
+		math.h header file from include/nuttx/lib/math.h to include/math.h. math.h
 		will then include the architecture-specific version of math.h that you
 		must provide at nuttx/arch/>architecture</include/math.h.
 
diff --git a/Makefile.unix b/Makefile.unix
index 6d509018b8..a51ae6eab9 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -183,16 +183,16 @@ BIN = nuttx$(EXEEXT)
 all: $(BIN)
 .PHONY: context clean_context check_context export subdir_clean clean subdir_distclean distclean apps_clean apps_distclean
 
-# Target used to copy include/nuttx/math.h.  If CONFIG_ARCH_MATH_H is
+# Target used to copy include/nuttx/lib/math.h.  If CONFIG_ARCH_MATH_H is
 # defined, then there is an architecture specific math.h header file
 # that will be included indirectly from include/math.h.  But first, we
 # have to copy math.h from include/nuttx/. to include/.  Logic within
-# include/nuttx/math.h will hand the redirection to the architecture-
+# include/nuttx/lib/math.h will hand the redirection to the architecture-
 # specific math.h header file.
 #
 # If the CONFIG_LIBM is defined, the Rhombus libm will be built at libc/math.
 # Definitions and prototypes for the Rhombus libm are also contained in
-# include/nuttx/math.h and so the file must also be copied in that case.
+# include/nuttx/lib/math.h and so the file must also be copied in that case.
 #
 # If neither CONFIG_ARCH_MATH_H nor CONFIG_LIBM is defined, then no math.h
 # header file will be provided.  You would want that behavior if (1) you
@@ -208,8 +208,8 @@ endif
 endif
 
 ifeq ($(NEED_MATH_H),y)
-include/math.h: include/nuttx/math.h
-	$(Q) cp -f include/nuttx/math.h include/math.h
+include/math.h: include/nuttx/lib/math.h
+	$(Q) cp -f include/nuttx/lib/math.h include/math.h
 else
 include/math.h:
 endif
diff --git a/README.txt b/README.txt
index 4c12dca85a..8991f5d870 100644
--- a/README.txt
+++ b/README.txt
@@ -321,13 +321,13 @@ Notes about Header Files
 
     If you have a custom, architecture specific math.h header file, then
     that header file should be placed at arch/<cpu>/include/math.h.  There
-    is a stub math.h header file located at include/nuttx/math.h.  This stub
+    is a stub math.h header file located at include/nuttx/lib/math.h.  This stub
     header file can be used to "redirect" the inclusion to an architecture-
     specific math.h header file.  If you add an architecture specific math.h
     header file then you should also define CONFIG_ARCH_MATH_H=y in your
     NuttX Configuration file.  If CONFIG_ARCH_MATH_H is selected, then the
     top-level Makefile will copy the stub math.h header file from
-    include/nuttx/math.h to include/math.h where it will become the system
+    include/nuttx/lib/math.h to include/math.h where it will become the system
     math.h header file.  The stub math.h header file does nothing other
     than to include that architecture-specific math.h header file as the
     system math.h header file.
diff --git a/drivers/audio/vs1053.c b/drivers/audio/vs1053.c
index fd00b37444..aa4eb861a7 100644
--- a/drivers/audio/vs1053.c
+++ b/drivers/audio/vs1053.c
@@ -58,7 +58,7 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/audio/audio.h>
 #include <nuttx/audio/vs1053.h>
-#include <nuttx/math.h>
+#include <nuttx/lib/math.h>
 
 #include "vs1053.h"
 
diff --git a/drivers/audio/wm8904.c b/drivers/audio/wm8904.c
index 2bd2502b8d..4489ae0f22 100644
--- a/drivers/audio/wm8904.c
+++ b/drivers/audio/wm8904.c
@@ -69,7 +69,7 @@
 #include <nuttx/audio/i2s.h>
 #include <nuttx/audio/audio.h>
 #include <nuttx/audio/wm8904.h>
-#include <nuttx/math.h>
+#include <nuttx/lib/math.h>
 
 #include "wm8904.h"
 
diff --git a/include/nuttx/math.h b/include/nuttx/lib/math.h
similarity index 98%
rename from include/nuttx/math.h
rename to include/nuttx/lib/math.h
index d6963a5013..108706c2b9 100644
--- a/include/nuttx/math.h
+++ b/include/nuttx/lib/math.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/nuttx/math.h
+ * include/nuttx/lib/math.h
  *
- *   Copyright (C) 2009, 2012, 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2012, 2014-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_MATH_H
-#define __INCLUDE_NUTTX_MATH_H
+#ifndef __INCLUDE_NUTTX_LIB_MATH_H
+#define __INCLUDE_NUTTX_LIB_MATH_H
 
 /****************************************************************************
  * Included Files
@@ -406,4 +406,4 @@ long double truncl (long double x);
 #endif
 
 #endif /* CONFIG_LIBM */
-#endif /* __INCLUDE_NUTTX_MATH_H */
+#endif /* __INCLUDE_NUTTX_LIB_MATH_H */
diff --git a/libc/math/Kconfig b/libc/math/Kconfig
index 6fb14ec272..a3a859824e 100644
--- a/libc/math/Kconfig
+++ b/libc/math/Kconfig
@@ -17,8 +17,9 @@ config LIBM
 
 		Another possibility is that you have a custom, architecture-specific math
 		libary and that the corresponding math.h file resides at arch/<architecture>/include/math.h.
-		The option is selected via ARCH_MATH_H.  If ARCH_MATH_H is selected,then the include/nuttx/math.h
-		header file will be copied to include/math.h where it can be used by your applications.
+		The option is selected via ARCH_MATH_H.  If ARCH_MATH_H is selected,then the
+		include/nuttx/libmath.h header file will be copied to include/math.h where it can
+		be used by your applications.
 
 		If ARCH_MATH_H is not defined, then this option can be selected to build a generic,
 		math library built into NuttX.  This math library comes from the Rhombus OS and