diff --git a/doc/ncmpcpp.1 b/doc/ncmpcpp.1
index 22d5dfb1..aeedd1bd 100644
--- a/doc/ncmpcpp.1
+++ b/doc/ncmpcpp.1
@@ -9,37 +9,39 @@ ncmpcpp is an ncurses client for MPD (Music Player Daemon), inspired by ncmpc.
 
 Read more about MPD at http://www.musicpd.org
 .SH "OPTIONS"
-.B \-h, \-\-host
+Mandatory arguments to long options are mandatory for short options too.
+.TP
+\fB\-h\fR, \fB\-\-host\fR=\fIHOST\fR
 Connect to server at host [localhost]
 .TP
-.B \-p, \-\-port
+\fB\-p\fR, \fB\-\-port\fR=\fIPORT\fR
 Connect to server at port [6600]
 .TP
-.B \-\-current-song
+\fB\-\-current-song\fR[=\fIFORMAT\fR]
 Print current song using given format and exit
 .TP
-.B \-c, \-\-config
+\fB\-c\fR, \fB\-\-config\fR=\fIFILE\fR
 Specify configuration file(s)
 .TP
-.B \-\-ignore-config-errors
+\fB\-\-ignore-config-errors\fR
 Ignore unknown and invalid options in configuration files
 .TP
-.B \-c, \-\-bindings
+\fB\-c\fR, \fB\-\-bindings\fR=\fIFILE\fR
 Specify bindings file(s)
 .TP
-.B \-s, \-\-screen <name>
+\fB\-s\fR, \fB\-\-screen <name>\fR
 Specify the startup screen (<name> may be: help, playlist, browser, search_engine, media_library, playlist_editor, tag_editor, outputs, visualizer, clock)
 .TP
-.B \-S, \-\-slave-screen <name>
+\fB\-S\fR, \fB\-\-slave-screen <name>\fR
 Specify the startup slave screen (<name> may be: help, playlist, browser, search_engine, media_library, playlist_editor, tag_editor, outputs, visualizer, clock)
 .TP
-.B \-q, \-\-quiet
+\fB\-q\fR, \fB\-\-quiet\fR
 Suppress logs and excess output
 .TP
-.B \-?, \-\-help
+\fB\-?\fR, \fB\-\-help\fR
 Display help.
 .TP
-.B \-v, \-\-version
+\fB\-v\fR, \fB\-\-version\fR
 Display version information.
 
 .SH "CONFIGURATION"
@@ -277,10 +279,10 @@ If set to yes, filenames generated by ncmpcpp (with tag editor, for lyrics, arti
 If set to yes, it will be possible to physically delete files and directories from the disk in the browser.
 .TP
 .B lastfm_preferred_language = ISO 639 alpha-2 language code
-If set, ncmpcpp will try to get info from last.fm in language you set and if it fails, it will fall back to english. Otherwise it will use english the first time.
+If set, ncmpcpp will try to get info from last.fm in language you set and if it fails, it will fall back to English. Otherwise it will use English the first time.
 .TP
 .B space_add_mode = add_remove/always_add
-If set to add_remove, attepting to add files that are already in playlist will remove them. Otherwise they can be added multiple times.
+If set to add_remove, attempting to add files that are already in playlist will remove them. Otherwise they can be added multiple times.
 .TP
 .B show_hidden_files_in_local_browser = yes/no
 Trigger for displaying in local browser files and directories that begin with '.'