diff --git a/docs/faq.html b/docs/faq.html
index dfde2236..2835d7aa 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -131,20 +131,25 @@ created symlinks to autorun directory (eg. <code>cd
 ~/.irssi/scripts/autorun/ ; ln -s ../script.pl .</code>)</p>
 
 
+<h3>Q: How do I execute commands automatically at startup?</h3>
+
+<p>A: Put them into <code>~/.irssi/startup</code> file, each command on its
+own line. The preceding slash (/) is not necessary.</p>
+
+
 <h3>Q: How do I easily edit existing topic?</h3>
 
 <p>A: /TOPIC &lt;tab&gt;</p>
 
 <h3>Q: How can I have /WHOIS replies to active window?</h3>
 
-<p>A: Currently there's no other way than to close the status window, or at
-least do <code>/WINDOW LEVEL -CRAP</code> in it, but that would make a lot
-other messages show up in active window too. I don't have many good ideas
-how this could be easily fixed inside irssi (no, kludging it to only work
-with whois isn't a "fix") - it'd be possible to create a script do this
-though but currently it doesn't exist.</p>
+<p>A: You can disable the status window, or do <code>/WINDOW LEVEL
+-CRAP</code> in it which would also make several other messages show up in
+active window. You can also use a
+<a href="http://dgl.cx/irssi/hack-whois-in-current-window.pl">script</a>.</p>
 
 <h3>Q: How do i add the active network to the statusbar</h3>
 
 <p>A: Modify the window-line in statusbar section in config file to
 <code>window = "{sb $winref:$tag/$T{sbmode $M}}";</code></p>
+