diff --git a/Makefile.am b/Makefile.am
index 30222f3..beb7c58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,8 +31,15 @@ DISTCLEANFILES = \
.PHONY: man upload
man:
- mandoc -man -Thtml -Ostyle=style.css man/spek.1 > web/man-@VERSION@.html
- sed -e 's#\(http://[^<]*\)#\1#g' -i '' web/man-@VERSION@.html
+ man man/spek.1 | man2html -title "Spek @VERSION@ manual" > web/man-@VERSION@.html
+ sed -e 's#\(http://[^<]*\)#\1#g' -i '' web/man-@VERSION@.html
+ sed -e 's#
#\
+ #' -i '' web/man-@VERSION@.html
upload:
rsync -avhz web/nginx.conf server:spek
diff --git a/man/spek.1.in b/man/spek.1.in
index 1b3d32b..0ce54a5 100644
--- a/man/spek.1.in
+++ b/man/spek.1.in
@@ -30,6 +30,8 @@ Output the help message then quit.
.BR \-V , " --version"
Output version information then quit.
.SH KEYBINDINGS
+.SS Notes
+On OS X use the Command key instead of Ctrl.
.SS Menu
.TP
.B Ctrl-O
@@ -41,10 +43,10 @@ Save the spectrogram as an image file.
.B Ctrl-E
Show the preferences dialog.
.TP
-.B Ctrl-Q
-Quit.
-.TP
.B F1
+Open online manual in the browser.
+.TP
+.B Shift-F1
Show the about dialog.
.SS Spectrogram
.TP
@@ -59,7 +61,7 @@ Change the upper limit of the dynamic range in dBFS.
The configuration file for Spek, stored in a simple INI format.
.SH AUTHORS
Alexander Kojevnikov . Other contributors are listed
-in the AUTHORS.md file distributed with the source code.
+in the LICENCE.md file distributed with the source code.
.SH DISTRIBUTION
The latest version of
.B Spek
diff --git a/web/man-0.8.0.html b/web/man-0.8.0.html
index b29080b..66b786d 100644
--- a/web/man-0.8.0.html
+++ b/web/man-0.8.0.html
@@ -1,120 +1,88 @@
-
-
-
-
-
-
-
-SPEK(1)
-
-
-
-
-
-
-
-
-
-
-SPEK(1)
-
-
-
-SPEK(1)
-
-
-
-
-
NAME
Spek - Acoustic Spectrum Analyser
-
-
SYNOPSIS
spek [OPTION...] [FILE]
-
-
DESCRIPTION
Spek generates a spectrogram for the input audio file.
-
-
OPTIONS
-
--h, --help
-
-Output the help message then quit.
-
-
-
--V, --version
-
-Output version information then quit.
-
-
-
-
KEYBINDINGS
-
Menu
-
-Ctrl-O
-
-Open a new file.
-
-
-
-Ctrl-S
-
-Save the spectrogram as an image file.
-
-
-
-Ctrl-E
-
-Show the preferences dialog.
-
-
-
-Ctrl-Q
-
-Quit.
-
-
-
-F1
-
-Show the about dialog.
-
-
-
-
Spectrogram
-
-Ctrl-up, Ctrl-down
-
-Change the lower limit of the dynamic range in dBFS.
-
-
-
-Ctrl-Shift-up, Ctrl-Shift-down
-
-Change the upper limit of the dynamic range in dBFS.
-
-
-
-
-
FILES
-
-~/.config/spek/preferences
-
-The configuration file for Spek, stored in a simple INI format.
-
-
-
-
AUTHORS
Alexander Kojevnikov <alexander@kojevnikov.com>. Other contributors are listed in the AUTHORS.md file distributed with the source code.
+ Spek generates a spectrogram for the input audio file.
+
+
+
+
OPTIONS
+ -h, --help
+ Output the help message then quit.
+
+ -V, --version
+ Output version information then quit.
+
+
+
+
KEYBINDINGS
+ Notes
+ On OS X use the Command key instead of Ctrl.
+
+ Menu
+ Ctrl-O Open a new file.
+
+ Ctrl-S Save the spectrogram as an image file.
+
+ Ctrl-E Show the preferences dialog.
+
+ F1 Open online manual in the browser.
+
+ Shift-F1
+ Show the about dialog.
+
+ Spectrogram
+ Ctrl-up, Ctrl-down
+ Change the lower limit of the dynamic range in dBFS.
+
+ Ctrl-Shift-up, Ctrl-Shift-down
+ Change the upper limit of the dynamic range in dBFS.
+
+
+
+
FILES
+ ~/.config/spek/preferences
+ The configuration file for Spek, stored in a simple INI format.
+
+
+
+
AUTHORS
+ Alexander Kojevnikov <alexander@kojevnikov.com>. Other contributors are
+ listed in the LICENCE.md file distributed with the source code.
+
+
+
+
DISTRIBUTION
+ The latest version of Spek may be downloaded from
+ http://spek-project.org.
+
+
+
+Spek 0.8.0 2012-09-19 SPEK(1)
+