diff --git a/README.rst b/README.rst
index 81f4bca1..b9851e56 100644
--- a/README.rst
+++ b/README.rst
@@ -155,3 +155,16 @@ If you want to see new features in Pelican, dont hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
 
 Contact me at "alexis at notmyidea dot org" for any request/feedback !
+
+FAQ
+---
+
+Here are some frequently asqued questions.
+
+How do I specify my site URL? I dont want to use the default "/home/…" folder.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Configure the `SITENAME` to your site base url, let's say
+`http://myswebsite.tld`, in your settings file::
+
+    SITENAME = "http://mywebsite.tld"
diff --git a/THANKS b/THANKS
index 5dc1196e..88799080 100644
--- a/THANKS
+++ b/THANKS
@@ -4,3 +4,5 @@ bugs or giving ideas. Thanks to them !
 - Dan Jacka
 - solsTiCe on linuxfr for reporting bugs
 - Guillaume B (Gui13)
+- Ronny Pfannschmidt
+- Jérome Renard
diff --git a/TODO b/TODO
index b91164a3..0ff78934 100644
--- a/TODO
+++ b/TODO
@@ -3,3 +3,6 @@
 * find a better way to specify the templates. an idea is simply to install the templates in a default path, and to add a way to specify them by default under a "_themes" dir.
 * Make the program support UTF8-encoded files as input (and later: any encoding?)
 * Change the directory structure ?
+* Add status support (draft, published, hidden)
+* Add a serve + automatic generation behaviour.
+* Recompile only the changed files, not all.