diff --git a/README b/README
index 56be5c7..3fa7dbc 100644
--- a/README
+++ b/README
@@ -50,7 +50,7 @@
 
 3. Download
 
-    Find the latest release tarball at http://tio.github.io
+    Find the latest release tarball at https://tio.github.io
 
     The latest source is available on github: https://github.com/tio/tio
 
diff --git a/configure.ac b/configure.ac
index f251d9e..db8a286 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT([tio], [1.7], [], [tio], [http://tio.github.io])
+AC_INIT([tio], [1.7], [], [tio], [https://tio.github.io])
 AC_CONFIG_HEADERS([src/include/config.h])
 AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip -Wall -Werror])
 AM_SILENT_RULES([yes])
diff --git a/man/tio.1 b/man/tio.1
index 933ab91..54751ce 100644
--- a/man/tio.1
+++ b/man/tio.1
@@ -1,4 +1,4 @@
-.TH "tio" "1" "30 September 2014"
+.TH "tio" "1" "7 May 2016"
 
 .SH "NAME"
 tio \- The simple TTY terminal I/O application
@@ -6,7 +6,7 @@ tio \- The simple TTY terminal I/O application
 .SH "SYNOPSIS"
 .PP
 .B tio
-[<options>] <tty device>
+.RI "[" <options> "] " "<tty device>"
 
 .SH "DESCRIPTION"
 .PP
@@ -17,43 +17,43 @@ commandline interface to easily connect to TTY devices for basic input/output.
 .SH "OPTIONS"
 
 .TP
-.B \-b, \--baudrate <bps>
+.BR \-b ", " "\-\-baudrate " \fI<bps>
 
 Set baud rate [bps] (default: 115200).
 .TP
-.B \-d, \--databits 5|6|7|8
+.BR \-d ", " "\-\-databits 5" | 6 | 7 | 8
 
 Set data bits (default: 8).
 .TP
-.B \-f, \--flow hard|soft|none
+.BR \-f ", " "\-\-flow hard" | soft | none
 
 Set flow control (default: none).
 .TP
-.B \-s, \--stopbits 1|2
+.BR \-s ", " "\-\-stopbits 1" | 2
 
 Set stop bits (default: 1).
 .TP
-.B \-p, \--parity odd|even|none
+.BR \-p ", " "\-\-parity odd" | even | none
 
 Set parity (default: none).
 .TP
-.B \-o, \--output-delay <ms>
+.BR \-o ", " "\-\-output\-delay " \fI<ms>
 
-Set output delay [ms] - delay inserted between each transmitted character (default: 0).
+Set output delay [ms] \(em delay inserted between each transmitted character (default: 0).
 .TP
-.B \-n, \--no-autoconnect
+.BR \-n ", " \-\-no\-autoconnect
 
 Disable automatic connect.
 .TP
-.B \-l, \--log <filename>
+.BR \-l ", " "\-\-log " \fI<filename>
 
 Log to file.
 .TP
-.B \-v, \--version
+.BR \-v ", " \-\-version
 
 Display program version.
 .TP
-.B \-h, \--help
+.BR \-h ", " \-\-help
 
 Display help.
 
@@ -69,15 +69,15 @@ tio /dev/ttyUSB0
 .TP
 Which corresponds to:
 
-tio -b 115200 -d 8 -f none -s 1 -p none /dev/ttyUSB0
+tio \-b 115200 \-d 8 \-f none \-s 1 \-p none /dev/ttyUSB0
 .TP
 It is recommended to connect serial tty devices by id. For example:
 
-tio /dev/serial/by-id/usb-FTDI_TTL232R-3V3_FTGQVXBL-if00-port0
+tio /dev/serial/by\-id/usb\-FTDI_TTL232R-3V3_FTGQVXBL\-if00\-port0
 .PP
 Using serial devices by id ensures that tio automatically reconnects to the
 correct serial device if the device is disconnected and then reconnected.
 
 .SH "AUTHOR"
 .PP
-Written by Martin Lund <martin.lund@keep-it-simple.com>.
+Written by Martin Lund <martin.lund@keep\-it\-simple.com>.