diff --git a/README.md b/README.md
index 1f9411a6..a0b516c3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# subtitle: A window switcher, run dialog and dmenu replacement
+# A window switcher, run dialog and dmenu replacement
 
 A popup window switcher roughly based on [superswitcher](http://code.google.com/p/superswitcher/),
 requiring only xlib and pango.
diff --git a/doc/rofi-manpage.markdown b/doc/rofi-manpage.markdown
index e13400d3..0f156e96 100644
--- a/doc/rofi-manpage.markdown
+++ b/doc/rofi-manpage.markdown
@@ -2,7 +2,7 @@
 
 ## NAME
 
-rofi - A window switcher, run launcher, ssh dialog and dmenu replacement
+**rofi** - A window switcher, run launcher, ssh dialog and dmenu replacement
 
 ## SYNOPSIS
 
@@ -529,7 +529,7 @@ The following options are further explained in the theming section:
 
 ## PATTERN
 
-To launch commands (e.g. when using the ssh launcher) the user can enter the used commandline,
+To launch commands (e.g. when using the ssh launcher) the user can enter the used command-line,
 the following keys can be used that will be replaced at runtime:
 
 * `{host}`: The host to connect to.
@@ -688,6 +688,9 @@ Keybindings can be modified using the configuration systems.
 
 Qball Cow <qball@gmpclient.org>
 
+Rasmus Steinke
+
 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 da804be8..3ebab373 100644
--- a/doc/rofi.1
+++ b/doc/rofi.1
@@ -1,7 +1,7 @@
 .TH ROFI 1 rofi
 .SH NAME
 .PP
-rofi \- A window switcher, run launcher, ssh dialog and dmenu replacement
+\fBrofi\fP \- A window switcher, run launcher, ssh dialog and dmenu replacement
 .SH SYNOPSIS
 .PP
 \fBrofi\fP
@@ -690,7 +690,7 @@ simultaneous. This is useful when running **rofi** from a keybinding daemon.
 Dump the current active configuration in Xresources format to the command\-line.
 .SH PATTERN
 .PP
-To launch commands (e.g. when using the ssh launcher) the user can enter the used commandline,
+To launch commands (e.g. when using the ssh launcher) the user can enter the used command\-line,
 the following keys can be used that will be replaced at runtime:
 .RS
 .IP \(bu 2
@@ -913,6 +913,8 @@ Qball Cow
 .MT qball@gmpclient.org
 .ME
 .PP
+Rasmus Steinke
+.PP
 Original code based on work by: Sean Pringle 
 .MT sean.pringle@gmail.com
 .ME