diff --git a/Changelog b/Changelog
index 213c7223..bf8d39ea 100644
--- a/Changelog
+++ b/Changelog
@@ -9,6 +9,7 @@
         - Highlight multiple selected rows (#287)
 		- Dmenu can read from file instead of stdin.
     Improvements:
+		- Update manpage (#289, #291)
 		- Improve speed of reading stdin in dmenu mode.
         - Correctly handle modifier keys now. Should now support most weird keyboard layouts and switching between them.
           (#268, #265, #286)
diff --git a/doc/rofi.1 b/doc/rofi.1
index 52b4f49d..df488892 100644
--- a/doc/rofi.1
+++ b/doc/rofi.1
@@ -1,13 +1,13 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ROFI\-MANPAGE" "" "November 2015" "" ""
+.TH "ROFI\-MANPAGE" "" "December 2015" "" ""
 .
 .SH "NAME"
 \fBrofi\fR \- A window switcher, run launcher, ssh dialog and dmenu replacement
 .
 .SH "SYNOPSIS"
-\fBrofi\fR [ \-width \fIpct_scr\fR ] [ \-lines \fIlines\fR ] [ \-columns \fIcolumns\fR ] [ \-font \fIpangofont\fR ] [ \-fg \fIcolor\fR ] [ \-fg\-urgent \fIcolor\fR ] [ \-fg\-active \fIcolor\fR ] [ \-bg\-urgent \fIcolor\fR ] [ \-bg\-active \fIcolor\fR ] [ \-bg \fIcolor\fR ] [ \-bgalt \fIcolor\fR ] [ \-hlfg \fIcolor\fR ] [ \-hlbg \fIcolor\fR ] [ \-key\-\fBmode\fR \fIcombo\fR ] [ \-terminal \fIterminal\fR ] [ \-location \fIposition\fR ] [ \-fixed\-num\-lines ] [ \-padding \fIpadding\fR ] [ \-opacity \fIopacity%\fR ] [ \-display \fIdisplay\fR ] [ \-bc \fIcolor\fR ] [ \-bw \fIwidth\fR ] [ \-dmenu [ \-p \fIprompt\fR ] [ \-sep \fIseparator\fR ] [ \-l \fIselected line\fR ] [ \-mesg ] [ \-select ] ] [ \-filter \fIfilter\fR ] [ \-ssh\-client \fIclient\fR ] [ \-ssh\-command \fIcommand\fR ] [ \-disable\-history ] [ \-levenshtein\-sort ] [ \-case\-sensitive ] [ \-show \fImode\fR ] [ \-modi \fImode1,mode2\fR ] [ \-eh \fIelement height\fR ] [ \-lazy\-filter\-limit \fIlimit\fR ] [ \-e \fImessage\fR] [ \-a \fIrow\fR ] [ \-u \fIrow\fR ] [ \-pid \fIpath\fR ] [ \-now ] [ \-rnow ] [ \-snow ] [ \-version ] [ \-help ] [ \-dump\-xresources ] [ \-auto\-select ] [ \-parse\-hosts ] [ \-no\-parse\-known\-hosts ] [ \-combi\-modi \fImode1,mode2\fR ] [ \-normal\-window ] [ \-fake\-transparency ] [ \-quiet ] [ \-glob ] [ \-regex ] [ \-tokenize ] [ \-threads \fInum\fR ]
+\fBrofi\fR [ \-width \fIpct_scr\fR ] [ \-lines \fIlines\fR ] [ \-columns \fIcolumns\fR ] [ \-font \fIpangofont\fR ] [ \-fg \fIcolor\fR ] [ \-fg\-urgent \fIcolor\fR ] [ \-fg\-active \fIcolor\fR ] [ \-bg\-urgent \fIcolor\fR ] [ \-bg\-active \fIcolor\fR ] [ \-bg \fIcolor\fR ] [ \-bgalt \fIcolor\fR ] [ \-hlfg \fIcolor\fR ] [ \-hlbg \fIcolor\fR ] [ \-key\-\fBmode\fR \fIcombo\fR ] [ \-terminal \fIterminal\fR ] [ \-location \fIposition\fR ] [ \-fixed\-num\-lines ] [ \-padding \fIpadding\fR ] [ \-opacity \fIopacity%\fR ] [ \-display \fIdisplay\fR ] [ \-bc \fIcolor\fR ] [ \-bw \fIwidth\fR ] [ \-dmenu [ \-p \fIprompt\fR ] [ \-sep \fIseparator\fR ] [ \-l \fIselected line\fR ] [ \-mesg ] [ \-select ] [ \-input \fIinput\fR ] ] [ \-filter \fIfilter\fR ] [ \-ssh\-client \fIclient\fR ] [ \-ssh\-command \fIcommand\fR ] [ \-disable\-history ] [ \-levenshtein\-sort ] [ \-case\-sensitive ] [ \-show \fImode\fR ] [ \-modi \fImode1,mode2\fR ] [ \-eh \fIelement height\fR ] [ \-lazy\-filter\-limit \fIlimit\fR ] [ \-e \fImessage\fR] [ \-a \fIrow\fR ] [ \-u \fIrow\fR ] [ \-pid \fIpath\fR ] [ \-now ] [ \-rnow ] [ \-snow ] [ \-version ] [ \-help ] [ \-dump\-xresources ] [ \-auto\-select ] [ \-parse\-hosts ] [ \-no\-parse\-known\-hosts ] [ \-combi\-modi \fImode1,mode2\fR ] [ \-normal\-window ] [ \-fake\-transparency ] [ \-quiet ] [ \-glob ] [ \-regex ] [ \-tokenize ] [ \-threads \fInum\fR ]
 .
 .SH "DESCRIPTION"
 \fBrofi\fR is an X11 popup window switcher, run dialog, dmenu replacement and more\. It focuses on being fast to use and have minimal distraction\. It supports keyboard and mouse navigation, type to filter, tokenized search and more\.
@@ -173,7 +173,7 @@ Set the key combination to display a {mode} in daemon mode\.
 
 rofi \-key\-run F12
 rofi \-key\-ssh control+shift+s
-rofi \-key\-window mod1+Tab
+rofi \-key\-window SuperL+Tab
 .
 .fi
 .
@@ -1040,6 +1040,12 @@ Make \fBrofi\fR reacts like a normal application window\. Useful for scripts lik
 .P
 Dump the filtered list to stdout and quit\. This can be used to get the list as \fBrofi\fR would filter it\. Use together with \fB\-filter\fR command\.
 .
+.P
+\fB\-input\fR \fIfile\fR
+.
+.P
+Reads from \fIfile\fR instead of stdin\.
+.
 .SS "Message dialog"
 \fB\-e\fR \fImessage\fR
 .
@@ -1088,7 +1094,7 @@ If \fBargv[0]\fR (calling command) is dmenu, \fBrofi\fR will start in dmenu mode
 .
 .nf
 
-ln \-s /usr/bin/dmenu /usr/bin/rofi
+ln \-s /usr/bin/rofi /usr/bin/dmenu
 .
 .fi
 .
@@ -1285,7 +1291,7 @@ The first two fields specify the alpha level\. This determines the amount of tra
 \fBShift\-Del\fR: Delete entry from history\.
 .
 .IP "\(bu" 4
-\fBCtrl\-grave\fR: Toggle case sensitivity\.
+\fBgrave\fR: Toggle case sensitivity\.
 .
 .IP "" 0
 .
diff --git a/source/x11-helper.c b/source/x11-helper.c
index c30f33b1..228ed0eb 100644
--- a/source/x11-helper.c
+++ b/source/x11-helper.c
@@ -484,7 +484,7 @@ void x11_parse_key ( char *combo, unsigned int *mod, KeySym *key )
         }
     }
     int seen_mod = FALSE;
-    if ( strcasestr ( combo, "Mod")) {
+    if ( strcasestr ( combo, "Mod" ) ) {
         seen_mod = TRUE;
     }
 
@@ -502,11 +502,11 @@ void x11_parse_key ( char *combo, unsigned int *mod, KeySym *key )
     if ( sym == NoSymbol || ( !modmask && ( strchr ( combo, '-' ) || strchr ( combo, '+' ) ) ) ) {
         // TODO popup
         g_string_append_printf ( str, "Sorry, rofi cannot understand the key combination: <i>%s</i>\n", combo );
-        g_string_append(str, "\nRofi supports the following modifiers:\n\t");
-        g_string_append(str, "<i>Shift,Control,Alt,AltGR,SuperL,SuperR,");
-        g_string_append(str, "MetaL,MetaR,HyperL,HyperR</i>");
-        if(seen_mod) {
-            g_string_append(str, "\n\n<b>Mod1,Mod2,Mod3,Mod4,Mod5 are no longer supported, use one of the above.</b>" );
+        g_string_append ( str, "\nRofi supports the following modifiers:\n\t" );
+        g_string_append ( str, "<i>Shift,Control,Alt,AltGR,SuperL,SuperR," );
+        g_string_append ( str, "MetaL,MetaR,HyperL,HyperR</i>" );
+        if ( seen_mod ) {
+            g_string_append ( str, "\n\n<b>Mod1,Mod2,Mod3,Mod4,Mod5 are no longer supported, use one of the above.</b>" );
         }
     }
     if ( str->len > 0 ) {