diff --git a/Documentation/NuttxUserGuide.html b/Documentation/NuttxUserGuide.html
index eb5a27f53d4..917b52559fc 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: November 5, 2014</p>
+      <p>Last Updated: November 29, 2014</p>
     </td>
   </tr>
 </table>
@@ -7733,7 +7733,11 @@ interface of the same name.
 
 <ul><pre>
   #include &lt;sys/ioctl.h&gt;
-  int     ioctl(int fd, int req, unsigned long arg);
+  #ifdef CONFIG_LIBC_IOCTL_VARIADIC
+  int ioctl(int fd, int req, ...);
+  #else
+  int ioctl(int fd, int req, unsigned long arg);
+  #endif
 </pre></ul>
 
 <h4><a name="drvrpollops">2.10.2.4 poll.h</a></h4>
diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h
index edc91680839..60dfa5cea7b 100644
--- a/include/sys/ioctl.h
+++ b/include/sys/ioctl.h
@@ -69,7 +69,7 @@ extern "C"
  ****************************************************************************/
 
 /****************************************************************************
- * Name: ioctl/fs_ioctl
+ * Name: ioctl
  *
  * Description:
  *   Perform device specific operations.
@@ -79,7 +79,8 @@ extern "C"
  * Parameters:
  *   fd       File/socket descriptor of device
  *   req      The ioctl command
- *   arg      The argument of the ioctl cmd
+ *   arg      The argument of the ioctl cmd, OR
+ *   ...      A third argument of type unsigned long is still expected.
  *
  * Return:
  *   >=0 on success (positive non-zero values are cmd-specific)
diff --git a/libc/misc/lib_ioctl.c b/libc/misc/lib_ioctl.c
index 65932c12de5..a2838790cf9 100644
--- a/libc/misc/lib_ioctl.c
+++ b/libc/misc/lib_ioctl.c
@@ -54,7 +54,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: ioctl/fs_ioctl
+ * Name: ioctl
  *
  * Description:
  *   Perform device specific operations.
@@ -62,7 +62,7 @@
  * Parameters:
  *   fd       File/socket descriptor of device
  *   req      The ioctl command
- *   ...      One argument of type unsigned long is expected
+ *   ...      A third argument of type unsigned long is expected
  *
  * Return:
  *   >=0 on success (positive non-zero values are cmd-specific)