diff --git a/Documentation/NuttxUserGuide.html b/Documentation/NuttxUserGuide.html
index cdca1f59b19..6aa9905fe06 100644
--- a/Documentation/NuttxUserGuide.html
+++ b/Documentation/NuttxUserGuide.html
@@ -13,7 +13,7 @@
       <h1><big><font color="#3c34ec"><i>NuttX Operating System<p>User's Manual</i></font></big></h1>
       <p><small>by</small></p>
       <p>Gregory Nutt<p>
-      <p>Last Updated: April 9, 2015</p>
+      <p>Last Updated: June 2, 2015</p>
     </td>
   </tr>
 </table>
@@ -8097,7 +8097,9 @@ FAR char *tempnam(FAR const char *dir, FAR const char *pfx);
 int mkdir(FAR const char *pathname, mode_t mode);
 int mkfifo(FAR const char *pathname, mode_t mode);
 int stat(const char *path, FAR struct stat *buf);
+#if 0 /* Not yet supported */
 int fstat(int fd, FAR struct stat *buf);
+#endif
 
 #include &lt;sys/statfs.h&gt;
 
diff --git a/binfmt/libelf/libelf_init.c b/binfmt/libelf/libelf_init.c
index a074991cb40..2ba84bfefda 100644
--- a/binfmt/libelf/libelf_init.c
+++ b/binfmt/libelf/libelf_init.c
@@ -102,7 +102,7 @@ static inline int elf_filelen(FAR struct elf_loadinfo_s *loadinfo,
   if (ret < 0)
     {
       int errval = errno;
-      bdbg("Failed to fstat file: %d\n", errval);
+      bdbg("Failed to stat file: %d\n", errval);
       return -errval;
     }
 
diff --git a/include/sys/stat.h b/include/sys/stat.h
index ece119809b6..a27d2243653 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -100,8 +100,9 @@
  * Type Definitions
  ****************************************************************************/
 
-/* This is the simplified struct stat as returned by fstat(). This structure
- * provides information about a specific file or directory in the file system.
+/* This is the simplified struct stat as returned by stat() and fstat().
+ * This structure provides information about a specific file or directory in
+ * the file system.
  */
 
 struct stat
@@ -131,7 +132,9 @@ extern "C"
 int mkdir(FAR const char *pathname, mode_t mode);
 int mkfifo(FAR const char *pathname, mode_t mode);
 int stat(const char *path, FAR struct stat *buf);
+#if 0 /* Not yet supported */
 int fstat(int fd, FAR struct stat *buf);
+#endif
 
 #undef EXTERN
 #if defined(__cplusplus)