diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3518c87..a9e923c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,7 @@
 RTV Changelog
 =============
 
+.. _1.8.0: http://github.com/michael-lazar/rtv/releases/tag/v1.8.0
 .. _1.7.0: http://github.com/michael-lazar/rtv/releases/tag/v1.7.0
 .. _1.6.1: http://github.com/michael-lazar/rtv/releases/tag/v1.6.1
 .. _1.6: http://github.com/michael-lazar/rtv/releases/tag/v1.6
@@ -15,6 +16,22 @@ RTV Changelog
 .. _1.2: http://github.com/michael-lazar/rtv/releases/tag/v1.2
 
 
+------------------
+1.8.0_ (2015-12-20
+------------------
+Features
+
+* A banner on the top of the page now displays the selected page sort order.
+* Hidden scores now show up as "- pts".
+* Oauth settings are now accesible through the config file.
+* New argument `--config` specifies the config file to use.
+* New argument `--copy-config` generates a default config file.
+
+Documentation
+
+* Added a keyboard reference from keyboardlayouteditor.com
+* Added a link to an asciinema demo video
+
 -------------------
 1.7.0_ (2015-12-08)
 -------------------
diff --git a/rtv.1 b/rtv.1
index 2f4d471..babc818 100644
--- a/rtv.1
+++ b/rtv.1
@@ -1,8 +1,8 @@
-.TH "RTV" "1" "December 07, 2015" "Version 1.7" "Usage and Commands"
+.TH "RTV" "1" "December 20, 2015" "Version 1.8.0" "Usage and Commands"
 .SH NAME
 RTV - Reddit Terminal Viewer
 .SH SYNOPSIS
-rtv [\-h] [\-V] [\-s SUBREDDIT] [\-l LINK] [\-\-ascii] [\-\-log FILE] [\-\-non\-persistent] [\-\-clear\-auth]
+rtv [\-h] [\-V] [\-s SUBREDDIT] [\-l LINK] [\-\-log FILE] [\-\-config FILE] [\-\-ascii] [\-\-non\-persistent] [\-\-clear\-auth] [\-\-copy\-config]
 .SH DESCRIPTION
 Reddit Terminal Viewer is a lightweight browser for www.reddit.com built into a
 terminal window.
@@ -23,21 +23,29 @@ name of the subreddit that will be opened on start
 \fB\-l LINK\fR
 full URL of a submission that will be opened on start
 
+.TP
+\fB\-\-log FILE\fR
+log HTTP requests to the given file
+
+.TP
+\fB\-\-config FILE\fR
+Load configuration settings from the given file
+
 .TP
 \fB\-\-ascii\fR
 enable ascii\-only mode
 
-.TP
-\fB\-\-log FILE\fR
-log HTTP requests to a file
-
 .TP
 \fB\-\-non\-persistent\fR
-Forget all authenticated users when the program exits
+Forget the authenticated user when the program exits
 
 .TP
 \fB\-\-clear\-auth\fR
-Remove any saved OAuth tokens before starting
+Remove any saved user data before launching
+
+.TP
+\fB\-\-copy\-config\fR
+Copy the default configuration to {HOME}/.config/rtv/rtv.cfg
 
 
 .SH CONTROLS
diff --git a/rtv/__version__.py b/rtv/__version__.py
index 93cb58d..5bafdc1 100644
--- a/rtv/__version__.py
+++ b/rtv/__version__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '1.7.0'
+__version__ = '1.8.0'
diff --git a/scripts/build_manpage.py b/scripts/build_manpage.py
index c6e14d6..81f5ec1 100644
--- a/scripts/build_manpage.py
+++ b/scripts/build_manpage.py
@@ -43,9 +43,15 @@ def main():
     #         \fB-h\fR, \fB--help\fR
     #         show this help message and exit
     options = ''
-    arguments = help_sections[2].split('\n')
-    for argument in arguments[1:]:
-        argument = argument.strip()
+    lines = help_sections[2].split('\n')[1:]
+    lines = [line.strip() for line in lines]
+    arguments = []
+    for line in lines:
+        if line.startswith('-'):
+            arguments.append(line)
+        else:
+            arguments[-1] = arguments[-1] + ' ' + line
+    for argument in arguments:
         flag, description = (col.strip() for col in argument.split('  ', 1))
         flag = ', '.join(r'\fB'+f+r'\fR' for f in flag.split(', '))
         options += '\n'.join(('.TP', flag, description, '\n'))
@@ -56,8 +62,8 @@ def main():
     data['copyright'] = rtv.__copyright__
     # Escape dashes is all of the sections
     data = {k: v.replace('-', r'\-') for k, v in data.items()}
-    print('Reading from %s/rtv/scripts/rtv.1.template' % ROOT)
-    with open(os.path.join(ROOT, 'rtv/scripts/rtv.1.template')) as fp:
+    print('Reading from %s/scripts/rtv.1.template' % ROOT)
+    with open(os.path.join(ROOT, 'scripts/rtv.1.template')) as fp:
         template = fp.read()
     print('Populating template')
     out = template.format(**data)