diff --git a/doc/html/faq.shtml b/doc/html/faq.shtml
index 6728a541b32030d06aa35e61e2f26a0291e18120..550df4caa8a1e2ff96063fc14f176e3794366145 100644
--- a/doc/html/faq.shtml
+++ b/doc/html/faq.shtml
@@ -474,9 +474,11 @@ you should see signs of the <i>slurmd</i> daemon's non-responsiveness.
 A variety of factors can be responsible for this problem
 including diskless nodes encountering network problems or
 very slow Network Information Service (NIS).
-The <i>--msg-timeout</i> option of <i>srun</i> may be helpful 
-to deal with the problem, although this introduces other 
-problems for fault tolerance. 
+In Slurm version 1.2, this can be addressed with the 
+<i>MessageTimeout</i> configuration parameter by setting a
+value higher than the default 5 seconds.
+In earlier versions of Slurm, the <i>--msg-timeout</i> option 
+of <i>srun</i> serves a similar purpose.
 
 <p class="footer"><a href="#top">top</a></p>