diff --git a/doc/rofi-manpage.markdown b/doc/rofi-manpage.markdown
index ba59b100..2cd3fa29 100644
--- a/doc/rofi-manpage.markdown
+++ b/doc/rofi-manpage.markdown
@@ -87,6 +87,7 @@ There are currently three methods of setting configuration options (evaluated in
  * Configuration File: This uses the same format as the Xresources file.
    By default it looks in `XDG_USER_CONFIG_DIR`/rofi/config, but can be overriden on commandline.
  * Command-line options: Arguments passed to **rofi**.
+ * System configuration file (f.e. /etc/rofi.conf).
 
 The Xresources file expects options starting with `rofi.` followed by it's name. An Example to set the number of lines:
 
@@ -123,6 +124,7 @@ Below is a list of the most important options:
 `-help`
 
 The help option shows the full list of commandline options and the current set value.
+These include dynamic options.
 
 `-dump-xresources`
 
@@ -777,6 +779,8 @@ Qball Cow <qball@gmpclient.org>
 
 Rasmus Steinke <rasi@xssn.at>
 
+Quentin Glidic
+
 Original code based on work by: Sean Pringle <sean.pringle@gmail.com>
 
 For a full list of authors, check the AUTHORS file.
diff --git a/doc/rofi.1 b/doc/rofi.1
index 9afda3a5..937e7082 100644
--- a/doc/rofi.1
+++ b/doc/rofi.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ROFI\-MANPAGE" "" "March 2016" "" ""
+.TH "ROFI\-MANPAGE" "" "April 2016" "" ""
 .
 .SH "NAME"
 \fBrofi\fR \- A window switcher, run launcher, ssh dialog and dmenu replacement
@@ -46,6 +46,9 @@ Configuration File: This uses the same format as the Xresources file\. By defaul
 .IP "\(bu" 4
 Command\-line options: Arguments passed to \fBrofi\fR\.
 .
+.IP "\(bu" 4
+System configuration file (f\.e\. /etc/rofi\.conf)\.
+.
 .IP "" 0
 .
 .P
@@ -137,7 +140,7 @@ Below is a list of the most important options:
 \fB\-help\fR
 .
 .P
-The help option shows the full list of commandline options and the current set value\.
+The help option shows the full list of commandline options and the current set value\. These include dynamic options\.
 .
 .P
 \fB\-dump\-xresources\fR
@@ -1246,6 +1249,9 @@ Qball Cow \fIqball@gmpclient\.org\fR
 Rasmus Steinke \fIrasi@xssn\.at\fR
 .
 .P
+Quentin Glidic
+.
+.P
 Original code based on work by: Sean Pringle \fIsean\.pringle@gmail\.com\fR
 .
 .P