diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl
index 26ea6e9..517c00e 100644
--- a/flashrom.8.tmpl
+++ b/flashrom.8.tmpl
@@ -1,3 +1,43 @@
+.\" Load the www device when using groff; provide a fallback for groff's MTO macro that formats email addresses.
+.ie \n[.g] \
+.  mso www.tmac
+.el \
+.  de MTO \\$2 \(la\\$1 \(ra\\$3
+.  .
+.\" Create wrappers for .MTO and .URL that print only text on systems w/o groff or if not outputting to a HTML
+.\" device. To that end we need to distinguish HTML output on groff from other configurations first.
+.nr groffhtml 0
+.if \n[.g] \
+.  if "\*[.T]"html" \
+.    nr groffhtml 1
+.\" For code reuse it would be nice to have a single wrapper that gets its target macro as parameter.
+.\" However, this did not work out with NetBSD's and OpenBSD's groff...
+.de URLB
+.  ie (\n[groffhtml]==1) \{\
+.    URL \\$@
+.  \}
+.  el \{\
+.    ie "\\$2"" \{\
+.      BR "\\$1" "\\$3"
+.    \}
+.    el \{\
+.      RB "\\$2 \(la" "\\$1" "\(ra\\$3"
+.    \}
+.  \}
+..
+.de MTOB
+.  ie (\n[groffhtml]==1) \{\
+.    MTO \\$@
+.  \}
+.  el \{\
+.    ie "\\$2"" \{\
+.      BR "\\$1" "\\$3"
+.    \}
+.    el \{\
+.      RB "\\$2 \(la" "\\$1" "\(ra\\$3"
+.    \}
+.  \}
+..
 .TH FLASHROM 8 "" ""
 .SH NAME
 flashrom \- detect, read, write, verify and erase flash chips
@@ -160,9 +200,8 @@
 Same as
 .BR \-\-list\-supported ,
 but outputs the supported hardware in MediaWiki syntax, so that it can be
-easily pasted into the wiki page at
-.nh
-.BR http://www.flashrom.org/ .
+easily pasted into the
+.URLB https://flashrom.org/Supported_hardware "supported hardware wiki page" .
 Please note that MediaWiki output is not compiled in by default.
 .TP
 .B "\-p, \-\-programmer <name>[:parameter[,parameter[,parameter]]]"
@@ -452,9 +491,9 @@
 .B BUGS
 section). The embedded controller (EC) in these
 machines often interacts badly with flashing.
-.nh
-.B http://www.flashrom.org/Laptops
-has more information. For example the EC firmware sometimes resides on the same
+More information is
+.URLB https://flashrom.org/Laptops "in the wiki" .
+For example the EC firmware sometimes resides on the same
 flash chip as the host firmware. While flashrom tries to change the contents of
 that memory the EC might need to fetch new instructions or data from it and
 could stop working correctly. Probing for and reading from the chip may also
@@ -480,10 +519,9 @@
 to tell flashrom (at your own risk) that it is not running on a laptop.
 .SS
 .BR "dummy " programmer
-The dummy programmer operates on a buffer in memory only. It provides a safe
-and fast way to test various aspects of flashrom and is mainly used in
-development and while debugging.
-.sp
+.IP
+The dummy programmer operates on a buffer in memory only. It provides a safe and fast way to test various
+aspects of flashrom and is mainly used in development and while debugging.
 It is able to emulate some chips to a certain degree (basic
 identify/read/erase/write operations work).
 .sp
@@ -599,6 +637,7 @@
 .BR "nic3com" , " nicrealtek" , " nicnatsemi" , " nicintel", " nicintel_eeprom"\
 , " nicintel_spi" , " gfxnvidia" , " ogp_spi" , " drkaiser" , " satasii"\
 , " satamv" , " atahpt", " atavia " and " it8212 " programmers
+.IP
 These programmers have an option to specify the PCI address of the card
 your want to use, which must be specified if more than one card supported
 by the selected programmer is installed in your system. The syntax is
@@ -619,6 +658,7 @@
 .B "flashrom \-p nic3com:pci=05:04.0"
 .SS
 .BR "atavia " programmer
+.IP
 Due to the mysterious address handling of the VIA VT6421A controller the user can specify an offset with the
 .sp
 .B "  flashrom \-p atavia:offset=addr"
@@ -627,10 +667,10 @@
 .B addr
 will be interpreted as usual (leading 0x (0) for hexadecimal (octal) values, or else decimal).
 For more information please see
-.nh
-.B http://flashrom.org/VT6421A
+.URLB https://flashrom.org/VT6421A "its wiki page" .
 .SS
 .BR "nicintel_eeprom " programmer
+.IP
 This is the first programmer module in flashrom that does not provide access to NOR flash chips but EEPROMs
 mounted on gigabit Ethernet cards based on Intel's 82580 NIC. Because EEPROMs normally do not announce their
 size nor allow to be identified, the controller relies on correct size values written to predefined addresses
@@ -639,6 +679,7 @@
 M95128, M95256 and OnSemi (Catalyst) CAT25CS128.
 .SS
 .BR "ft2232_spi " programmer
+.IP
 An optional parameter specifies the controller
 type and channel/interface/port it should support. For that you have to use the
 .sp
@@ -682,6 +723,7 @@
 syntax.
 .SS
 .BR "serprog " programmer
+.IP
 A mandatory parameter specifies either a serial device (and baud rate) or an IP/port combination for
 communicating with the programmer.
 The device/baud combination has to start with
@@ -711,6 +753,7 @@
 in the source distribution.
 .SS
 .BR "buspirate_spi " programmer
+.IP
 A required
 .B dev
 parameter specifies the Bus Pirate device node and an optional
@@ -735,12 +778,13 @@
 .B state
 can be
 .BR on " or " off .
-More information about the Bus Pirate pull-up resistors and their purpose is available at
-.nh
-.BR "http://dangerousprototypes.com/docs/Practical_guide_to_Bus_Pirate_pull-up_resistors " .
+More information about the Bus Pirate pull-up resistors and their purpose is available
+.URLB "http://dangerousprototypes.com/docs/Practical_guide_to_Bus_Pirate_pull-up_resistors" \
+"in a guide by dangerousprototypes" .
 Only the external supply voltage (Vpu) is supported as of this writing.
 .SS
 .BR "pickit2_spi " programmer
+.IP
 An optional
 .B voltage
 parameter specifies the voltage the PICkit2 should use. The default unit is Volt if no unit is specified.
@@ -769,6 +813,7 @@
 (in Hz). The default is a frequency of 1 MHz.
 .SS
 .BR "dediprog " programmer
+.IP
 An optional
 .B voltage
 parameter specifies the voltage the Dediprog should use. The default unit is
@@ -819,6 +864,7 @@
 to select target chip 1 or 2 respectively. The default is target chip 1.
 .SS
 .BR "rayer_spi " programmer
+.IP
 The default I/O base address used for the parallel port is 0x378 and you can use
 the optional
 .B iobase
@@ -844,19 +890,16 @@
 STK200/300, " wiggler " for the Macraigor Wiggler, or " xilinx " for the Xilinx Parallel Cable III (DLC 5)."
 .sp
 More information about the RayeR hardware is available at
-.nh
-.BR "http://rayer.ic.cz/elektro/spipgm.htm " .
+.URLB "http://rayer.g6.cz/elektro/spipgm.htm" "RayeR's website" .
 The Altera ByteBlasterMV datasheet can be obtained from
-.nh
-.BR "http://www.altera.co.jp/literature/ds/dsbytemv.pdf " .
+.URLB "http://www.altera.co.jp/literature/ds/dsbytemv.pdf" Altera .
 For more information about the Macraigor Wiggler see
-.nh
-.BR "http://www.macraigor.com/wiggler.htm " .
+.URLB "http://www.macraigor.com/wiggler.htm" "their company homepage" .
 The schematic of the Xilinx DLC 5 was published in
-.nh
-.BR "http://www.xilinx.com/support/documentation/user_guides/xtp029.pdf " .
+.URLB "http://www.xilinx.com/support/documentation/user_guides/xtp029.pdf" "a Xilinx user guide" .
 .SS
 .BR "pony_spi " programmer
+.IP
 The serial port (like /dev/ttyS0, /dev/ttyUSB0 on Linux or COM3 on windows) is
 specified using the mandatory
 .B dev
@@ -867,8 +910,7 @@
 parameter accepts the values "si_prog" (default) or "serbang".
 .sp
 Information about the SI-Prog adapter can be found at
-.nh
-.BR "http://www.lancos.com/siprogsch.html " .
+.URLB "http://www.lancos.com/siprogsch.html" "its website" .
 .sp
 An example call to flashrom is
 .sp
@@ -878,6 +920,7 @@
 this slows down operation considerably.
 .SS
 .BR "ogp_spi " programmer
+.IP
 The flash ROM chip to access must be specified with the
 .B rom
 parameter.
@@ -907,6 +950,7 @@
 .BR http://wiki.opengraphics.org .
 .SS
 .BR "linux_spi " programmer
+.IP
 You have to specify the SPI controller to use with the
 .sp
 .B "  flashrom \-p linux_spi:dev=/dev/spidevX.Y"
@@ -925,6 +969,7 @@
 Please note that the linux_spi driver only works on Linux.
 .SS
 .BR "mstarddc_spi " programmer
+.IP
 The Display Data Channel (DDC) is an I2C bus present on VGA and DVI connectors, that allows exchanging
 informations between a computer and attached displays. Its most common uses are getting display capabilities
 through EDID (at I2C address 0x50) and sending commands to the display using the DDC/CI protocol (at address
@@ -1024,7 +1069,7 @@
 .B buspirate_spi
 needs userspace access to a serial port.
 .sp
-.BR dediprog ", " ft2232_spi " and " usbblaster_spi and " pickit2_spi
+.BR dediprog ", " ft2232_spi ", " usbblaster_spi " and " pickit2_spi
 need access to the USB device via libusb.
 .sp
 .B dummy
@@ -1034,7 +1079,7 @@
 .BR gfxnvidia ", " drkaiser ", " satasii ", " satamv ", " atahpt" and " atavia
 have to be run as superuser/root, and need additional raw access permission.
 .sp
-.BR serprog ", " buspirate_spi ", " dediprog ", " usbblaster_spi " and " ft2232_spi and " pickit2_spi
+.BR serprog ", " buspirate_spi ", " dediprog ", " usbblaster_spi ", " ft2232_spi " and " pickit2_spi
 can be run as normal user on most operating systems if appropriate device
 permissions are set.
 .sp
@@ -1047,23 +1092,22 @@
 .B "/etc/rc.securelevel"
 and rebooting, or rebooting into single user mode.
 .SH BUGS
-Please report any bugs to the flashrom mailing list at
-.B "<flashrom@flashrom.org>"
+Please report any bugs to the
+.MTOB "flashrom@flashrom.org" "flashrom mailing list" .
 .sp
 We recommend to subscribe first at
-.sp
-.B "  http://www.flashrom.org/mailman/listinfo/flashrom"
+.URLB "https://flashrom.org/mailman/listinfo/flashrom" "" .
 .sp
 Many of the developers communicate via the
 .B "#flashrom"
 IRC channel on
 .BR chat.freenode.net .
+If you don't have an IRC client, you can use the
+.URLB http://webchat.freenode.net/?channels=flashrom "freenode webchat" .
 You are welcome to join and ask questions, send us bug and success reports there
 too. Please provide a way to contact you later (e.g.\& a mail address) and be
-patient if there is no immediate reaction. Also, we provide a pastebin service
-at
-.nh
-.B http://paste.flashrom.org
+patient if there is no immediate reaction. Also, we provide a
+.URLB https://paste.flashrom.org "pastebin service"
 that is very useful when you want to share logs etc.\& without spamming the
 channel.
 .SS
@@ -1078,8 +1122,8 @@
 .B internal programmer
 subsection of the
 .B PROGRAMMER-SPECIFIC INFORMATION
-section and the information in our wiki at
-.BR "http://www.flashrom.org/Laptops " .
+section and the information
+.URLB "https://flashrom.org/Laptops" "in our wiki" .
 .SS
 One-time programmable (OTP) memory and unique IDs
 .sp
@@ -1174,8 +1218,10 @@
 .br
 some others, please see the flashrom svn changelog for details.
 .br
-All still active authors can be reached via email at <flashrom@flashrom.org>.
+All still active authors can be reached via
+.MTOB "flashrom@flashrom.org" "the mailing list" .
 .PP
-This manual page was written by Uwe Hermann <uwe@hermann-uwe.de>,
-Carl-Daniel Hailfinger and others.
+This manual page was written by
+.MTOB "uwe@hermann-uwe.de" "Uwe Hermann" ,
+Carl-Daniel Hailfinger, Stefan Tauner and others.
 It is licensed under the terms of the GNU GPL (version 2 or later).