diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html
index 472eb9417e7..d794b2b8fa4 100644
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
@@ -364,163 +364,169 @@
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdpoweroff">2.48 Shut the system down (poweroff)</a>
+    <a href="#cmdpmconfig">2.48 Manage Power Management Subsystem (pmconfig)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdput">2.49 Send File Via TFTP (put)</a>
+    <a href="#cmdpoweroff">2.49 Shut the system down (poweroff)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdpwd">2.50 Show Current Working Directory (pwd)</a>
+    <a href="#cmdput">2.50 Send File Via TFTP (put)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdreadlink">2.51 Show target of a link (readlink)</a>
+    <a href="#cmdpwd">2.51 Show Current Working Directory (pwd)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdreboot">2.52 Reset and reboot the system (reboot)</a>
+    <a href="#cmdreadlink">2.52 Show target of a link (readlink)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdrm">2.53 Remove a File (rm)</a>
+    <a href="#cmdreboot">2.53 Reset and reboot the system (reboot)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdrmdir">2.54 Remove a Directory (rmdir)</a>
+    <a href="#cmdrm">2.54 Remove a File (rm)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdrmmod">2.55 Remove on OS Module (rmmod)</a>
+    <a href="#cmdrmdir">2.55 Remove a Directory (rmdir)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdroute">2.56 Show routing table (route)</a>
+    <a href="#cmdrmmod">2.56 Remove on OS Module (rmmod)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdrptun">2.57 Start/Stop the OpenAMP RPC Tunnel (rptun)</a>
+    <a href="#cmdroute">2.57 Show routing table (route)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdset">2.58 Set a Variable (set)</a>
+    <a href="#cmdrptun">2.58 Start/Stop the OpenAMP RPC Tunnel (rptun)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdsh">2.59 Execute an NSH Script (sh)</a>
+    <a href="#cmdset">2.59 Set a Variable (set)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdshutdown">2.60 Shut the system down (shutdown)</a>
+    <a href="#cmdsh">2.60 Execute an NSH Script (sh)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdsleep">2.61 Wait for Seconds (sleep)</a>
+    <a href="#cmdshutdown">2.61 Shut the system down (shutdown)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdtelnetd">2.62 Start the Telnet Daemon (telnetd)</a>
+    <a href="#cmdsleep">2.62 Wait for Seconds (sleep)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdtime">2.63 Time execution of another command (time)</a>
+    <a href="#cmdtelnetd">2.63 Start the Telnet Daemon (telnetd)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdtruncate">2.64 Set the Size of a File (truncate)</a>
+    <a href="#cmdtime">2.64 Time execution of another command (time)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdunmount">2.65 Unmount a File System (umount)</a>
+    <a href="#cmdtruncate">2.65 Set the Size of a File (truncate)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmduname">2.66 Print system information (uname)</a>
+    <a href="#cmdunmount">2.66 Unmount a File System (umount)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdunset">2.67 Unset an Environment Variable (unset)</a>
+    <a href="#cmduname">2.67 Print system information (uname)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdurldec">2.68 URL Decode (urldecode)</a>
+    <a href="#cmdunset">2.68 Unset an Environment Variable (unset)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdurlencode">2.69 URL Encode (urlencode)</a>
+    <a href="#cmdurldec">2.69 URL Decode (urldecode)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmduseradd">2.70 Add a New User (useradd)</a>
+    <a href="#cmdurlencode">2.70 URL Encode (urlencode)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmduserdel">2.71 Delete a user (userdel)</a>
+    <a href="#cmduseradd">2.71 Add a New User (useradd)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdusleep">2.72 Wait for Microseconds (usleep)</a>
+    <a href="#cmduserdel">2.72 Delete a user (userdel)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdwget">2.73 Get File Via HTTP (wget)</a>
+    <a href="#cmdusleep">2.73 Wait for Microseconds (usleep)</a>
   </td>
 </tr>
 <tr>
   <td><br></td>
   <td>
-    <a href="#cmdxd">2.74 Hexadecimal Dump of Memory (xd)</a>
+    <a href="#cmdwget">2.74 Get File Via HTTP (wget)</a>
+  </td>
+</tr>
+<tr>
+  <td><br></td>
+  <td>
+    <a href="#cmdxd">2.75 Hexadecimal Dump of Memory (xd)</a>
   </td>
 </tr>
 <tr>
@@ -2737,7 +2743,24 @@ passwd &lt;username&gt; &lt;password&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdpoweroff"><h2>2.48 Shut the system down (poweroff)</h2></a>
+    <a name="cmdpmconfig"><h2>2.48 Manage Power Management Subsystem (pmconfig)</h2></a>
+  </td>
+  </tr>
+</table>
+
+<p><b>Command Syntax:</b></p>
+<ul><pre>
+pmconfig [stay|relax] [normal|idle|standby|sleep]
+</pre></ul>
+<p>
+  <b>Synopsis</b>.
+   Control power management subsystem.
+</p>
+
+<table width ="100%">
+  <tr bgcolor="#e4e4e4">
+  <td>
+    <a name="cmdpoweroff"><h2>2.49 Shut the system down (poweroff)</h2></a>
   </td>
   </tr>
 </table>
@@ -2761,7 +2784,7 @@ poweroff [&lt;n&gt;]
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdput"><h2>2.49 Send File Via TFTP (put)</h2></a>
+    <a name="cmdput"><h2>2.50 Send File Via TFTP (put)</h2></a>
   </td>
   </tr>
 </table>
@@ -2796,7 +2819,7 @@ put [-b|-n] [-f &lt;remote-path&gt;] -h &lt;ip-address&gt; &lt;local-path&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdpwd"><h2>2.50 Show Current Working Directory (pwd)</h2></a>
+    <a name="cmdpwd"><h2>2.51 Show Current Working Directory (pwd)</h2></a>
   </td>
   </tr>
 </table>
@@ -2826,7 +2849,7 @@ nsh&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdreadlink"><h2>2.51 Show target of a link (readlink)</h2></a>
+    <a name="cmdreadlink"><h2>2.52 Show target of a link (readlink)</h2></a>
   </td>
   </tr>
 </table>
@@ -2843,7 +2866,7 @@ readlink &lt;link&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdreboot"><h2>2.52 Reboot the system (reboot)</h2></a>
+    <a name="cmdreboot"><h2>2.53 Reboot the system (reboot)</h2></a>
   </td>
   </tr>
 </table>
@@ -2865,7 +2888,7 @@ reboot [&lt;n&gt;]
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdrm"><h2>2.53 Remove a File (rm)</h2></a>
+    <a name="cmdrm"><h2>2.54 Remove a File (rm)</h2></a>
   </td>
 </tr>
 </table>
@@ -2899,7 +2922,7 @@ nsh&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdrmdir"><h2>2.54 Remove a Directory (rmdir)</h2></a>
+    <a name="cmdrmdir"><h2>2.55 Remove a Directory (rmdir)</h2></a>
   </td>
 </tr>
 </table>
@@ -2934,7 +2957,7 @@ nsh&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdrmmod"><h2>2.55 Remove on OS Module (rmmod)</h2></a>
+    <a name="cmdrmmod"><h2>2.56 Remove on OS Module (rmmod)</h2></a>
   </td>
 </tr>
 </table>
@@ -2962,7 +2985,7 @@ nsh&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdroute"><h2>2.56 Show routing table (route)</h2></a>
+    <a name="cmdroute"><h2>2.57 Show routing table (route)</h2></a>
   </td>
   </tr>
 </table>
@@ -2983,7 +3006,7 @@ route ipv4|ipv6
 <tr>
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdrptun"><h2>2.57 Start/Stop the OpenAMP RPC Tunnel (rptun)</h2></a>
+    <a name="cmdrptun"><h2>2.58 Start/Stop the OpenAMP RPC Tunnel (rptun)</h2></a>
   </td>
   </tr>
 </table>
@@ -3000,7 +3023,7 @@ rptun start|stop &lt;dev-path&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdset"><h2>2.58 Set a Variable (set)</h2></a>
+    <a name="cmdset"><h2>2.59 Set a Variable (set)</h2></a>
   </td>
   </tr>
 </table>
@@ -3089,7 +3112,7 @@ foovalue
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdsh"><h2>2.59 Execute an NSH Script (sh)</h2></a>
+    <a name="cmdsh"><h2>2.60 Execute an NSH Script (sh)</h2></a>
   </td>
   </tr>
 </table>
@@ -3107,7 +3130,7 @@ sh &lt;script-path&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdshutdown"><h2>2.60 Shut the system down (shutdown)</h2></a>
+    <a name="cmdshutdown"><h2>2.61 Shut the system down (shutdown)</h2></a>
   </td>
   </tr>
 </table>
@@ -3128,7 +3151,7 @@ shutdown [--reboot]
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdsleep"><h2>2.61 Wait for Seconds (sleep)</h2></a>
+    <a name="cmdsleep"><h2>2.62 Wait for Seconds (sleep)</h2></a>
   </td>
   </tr>
 </table>
@@ -3145,7 +3168,7 @@ sleep &lt;sec&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdtelnetd"><h2>2.62 Time Start the Telnet Daemon (telnetd)</h2></a>
+    <a name="cmdtelnetd"><h2>2.63 Time Start the Telnet Daemon (telnetd)</h2></a>
   </td>
 </tr>
 </table>
@@ -3171,7 +3194,7 @@ telnetd
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdtime"><h2>2.63 Time execution of another command (time)</h2></a>
+    <a name="cmdtime"><h2>2.64 Time execution of another command (time)</h2></a>
   </td>
 </tr>
 </table>
@@ -3229,7 +3252,7 @@ nsh&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdtruncate"><h2>2.64 Set the Size of a File (truncate)</h2></a>
+    <a name="cmdtruncate"><h2>2.65 Set the Size of a File (truncate)</h2></a>
   </td>
 </tr>
 </table>
@@ -3257,7 +3280,7 @@ truncate -s &lt;length&gt; &lt;file-path&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdunmount"><h2>2.65 Unmount a File System (umount)</h2></a>
+    <a name="cmdunmount"><h2>2.66 Unmount a File System (umount)</h2></a>
   </td>
 </tr>
 </table>
@@ -3287,7 +3310,7 @@ nsh&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmduname"><h2>2.66 Print system information (uname)</h2></a>
+    <a name="cmduname"><h2>2.67 Print system information (uname)</h2></a>
   </td>
   </tr>
 </table>
@@ -3354,7 +3377,7 @@ uname [-a | -imnoprsv]
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdunset"><h2>2.67 Unset an Environment Variable (unset)</h2></a>
+    <a name="cmdunset"><h2>2.68 Unset an Environment Variable (unset)</h2></a>
   </td>
   </tr>
 </table>
@@ -3380,7 +3403,7 @@ nsh&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdurldec"><h2>2.68 URL Decode (urldecode)</h2></a>
+    <a name="cmdurldec"><h2>2.69 URL Decode (urldecode)</h2></a>
   </td>
   </tr>
 </table>
@@ -3397,7 +3420,7 @@ urldecode [-f] &lt;string or filepath&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdurlencode"><h2>2.69 URL Encode (urlencode)</h2></a>
+    <a name="cmdurlencode"><h2>2.70 URL Encode (urlencode)</h2></a>
   </td>
   </tr>
 </table>
@@ -3414,7 +3437,7 @@ urlencode [-f] &lt;string or filepath&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmduseradd"><h2>2.70 Add a New User (useradd)</h2></a>
+    <a name="cmduseradd"><h2>2.71 Add a New User (useradd)</h2></a>
   </td>
   </tr>
 </table>
@@ -3431,7 +3454,7 @@ useradd &lt;username&gt; &lt;password&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmduserdel"><h2>2.71 Delete a user (userdel)</h2></a>
+    <a name="cmduserdel"><h2>2.72 Delete a user (userdel)</h2></a>
   </td>
   </tr>
 </table>
@@ -3448,7 +3471,7 @@ userdel &lt;username&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdusleep"><h2>2.72 Wait for Microseconds (usleep)</h2></a>
+    <a name="cmdusleep"><h2>2.73 Wait for Microseconds (usleep)</h2></a>
   </td>
   </tr>
 </table>
@@ -3465,7 +3488,7 @@ usleep &lt;usec&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdwget"><h2>2.73 Get File Via HTTP (wget)</h2></a>
+    <a name="cmdwget"><h2>2.74 Get File Via HTTP (wget)</h2></a>
   </td>
   </tr>
 </table>
@@ -3492,7 +3515,7 @@ wget [-o &lt;local-path&gt;] &lt;url&gt;
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
-    <a name="cmdxd"><h2>2.74 Hexadecimal Dump of Memory (xd)</h2></a>
+    <a name="cmdxd"><h2>2.75 Hexadecimal Dump of Memory (xd)</h2></a>
   </td>
   </tr>
 </table>
@@ -3847,6 +3870,11 @@ nsh&gt;
     <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code> &amp;&amp; <code>CONFIG_NSH_LOGIN_PASSWD</code>sup>4</sup></td>
     <td><code>CONFIG_NSH_DISABLE_PASSWD</code></td>
   </tr>
+  <tr>
+    <td><b><code>pmconfig</code></b></td>
+    <td><code>CONFIG_PM</td>
+    <td><code>CONFIG_NSH_DISABLE_PMCONFIG</code></td>
+  </tr>
   <tr>
     <td><b><code>poweroff</code></b></td>
     <td><code>CONFIG_BOARDCTL_POWEROFF</td>
@@ -5901,6 +5929,7 @@ xxd -i romfs_img >nsh_romfsimg.h
   <li><a href="#environvars"><code>PATH</code></a></li>
   <li><a href="#builtinping"><code>ping</code></a></li>
   <li><a href="#builtinping"><code>ping6</code></a></li>
+  <li><a href="#cmdpmconfig"><code>pmconfig</code></a></li>
   <li><a href="#cmdpoweroff"><code>poweroff</code></a></li>
   <li><a href="#nshprompt">Prompt</a></li>
   <li><a href="#cmdps"><code>ps</code></a></li>