diff --git a/doc/apple2.sgml b/doc/apple2.sgml
index 940496a41..036f37207 100644
--- a/doc/apple2.sgml
+++ b/doc/apple2.sgml
@@ -3,7 +3,7 @@
 <article>
 
 <title>Apple&nbsp;&rsqb;&lsqb; specific information for cc65
-<author>Oliver Schmidt, <htmlurl url="mailto:ol.sc@web.de" name="ol.sc@web.de">
+<author><url url="mailto:ol.sc@web.de" name="Oliver Schmidt">
 <date>2009-10-07
 
 <abstract>
diff --git a/doc/apple2enh.sgml b/doc/apple2enh.sgml
index 87f993927..95a8c084c 100644
--- a/doc/apple2enh.sgml
+++ b/doc/apple2enh.sgml
@@ -3,7 +3,7 @@
 <article>
 
 <title>Enhanced&nbsp;Apple&nbsp;//e specific information for cc65
-<author>Oliver Schmidt, <htmlurl url="mailto:ol.sc@web.de" name="ol.sc@web.de">
+<author><url url="mailto:ol.sc@web.de" name="Oliver Schmidt">
 <date>2009-10-07
 
 <abstract>
diff --git a/doc/ar65.sgml b/doc/ar65.sgml
index d35bc9987..136defd40 100644
--- a/doc/ar65.sgml
+++ b/doc/ar65.sgml
@@ -3,7 +3,7 @@
 <article>
 
 <title>ar65 Users Guide
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>19.07.2000
 
 <abstract>
diff --git a/doc/atari.sgml b/doc/atari.sgml
index 007a95039..4b848575d 100644
--- a/doc/atari.sgml
+++ b/doc/atari.sgml
@@ -3,10 +3,9 @@
 <article>
 
 <title>Atari specific information for cc65
-<author>Shawn Jefferson, <htmlurl
-url="mailto:shawnjefferson@24fightingchickens.com"
-name="shawnjefferson@24fightingchickens.com"> and
-Christian Groessler, <htmlurl url="mailto:chris@groessler.org" name="chris@groessler.org">
+<author>
+<url url="mailto:shawnjefferson@24fightingchickens.com" name="Shawn Jefferson"> and<newline>
+<url url="mailto:chris@groessler.org" name="Christian Groessler">
 <date>2014-03-27
 
 <abstract>
diff --git a/doc/atmos.sgml b/doc/atmos.sgml
index 86f6b1154..805fc7a03 100644
--- a/doc/atmos.sgml
+++ b/doc/atmos.sgml
@@ -3,8 +3,9 @@
 <article>
 
 <title>Oric Atmos-specific information for cc65
-<author>Ullrich von Bassewitz <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org"><newline>
-Stefan A. Haubenthal <htmlurl url="mailto:polluks@sdf.lonestar.org" name="polluks@sdf.lonestar.org"><newline>
+<author>
+<url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">,<newline>
+<url url="mailto:polluks@sdf.lonestar.org" name="Stefan A. Haubenthal">,<newline>
 <url url="mailto:greg.king5@verizon.net" name="Greg King">
 <date>2014-03-27
 
diff --git a/doc/c128.sgml b/doc/c128.sgml
index a51767e69..3309d68af 100644
--- a/doc/c128.sgml
+++ b/doc/c128.sgml
@@ -3,7 +3,7 @@
 <article>
 
 <title>Commodore 128-specific information for cc65
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2014-03-24
 
 <abstract>
diff --git a/doc/c16.sgml b/doc/c16.sgml
index 5d4a5d372..a1317a0b5 100644
--- a/doc/c16.sgml
+++ b/doc/c16.sgml
@@ -3,7 +3,7 @@
 <article>
 
 <title>Commodore 16/116 specific information for cc65
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2003-12-15
 
 <abstract>
diff --git a/doc/c64.sgml b/doc/c64.sgml
index 2883ce79e..cef7f6467 100644
--- a/doc/c64.sgml
+++ b/doc/c64.sgml
@@ -3,7 +3,7 @@
 <article>
 
 <title>Commodore 64-specific information for cc65
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2014-03-24
 
 <abstract>
diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 364790b52..46c1f4457 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>ca65 Users Guide
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2000-07-19, 2000-11-29, 2001-10-02, 2005-09-08
 
 <abstract>
diff --git a/doc/cbm510.sgml b/doc/cbm510.sgml
index 3389bd4e1..3d01ab5bb 100644
--- a/doc/cbm510.sgml
+++ b/doc/cbm510.sgml
@@ -3,8 +3,9 @@
 <article>
 
 <title>Commodore 510 (aka P500) specific information for cc65
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org"><newline>
-Stefan A. Haubenthal, <htmlurl url="mailto:polluks@sdf.lonestar.org" name="polluks@sdf.lonestar.org"><newline>
+<author>
+<url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">,<newline>
+<url url="mailto:polluks@sdf.lonestar.org" name="Stefan A. Haubenthal">,<newline>
 <url url="mailto:greg.king5@verizon.net" name="Greg King">
 <date>2014-04-02
 
diff --git a/doc/cbm610.sgml b/doc/cbm610.sgml
index df44f1d76..2025c0792 100644
--- a/doc/cbm610.sgml
+++ b/doc/cbm610.sgml
@@ -3,9 +3,10 @@
 <article>
 
 <title>Commodore 610-specific information for cc65
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org"><newline>
+<author>
+<url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">,<newline>
 <url url="mailto:greg.king5@verizon.net" name="Greg King">
-<date>2004-04-02
+<date>2014-04-02
 
 <abstract>
 An overview over the Commodore 610 runtime system as it is implemented for the
diff --git a/doc/cc65.sgml b/doc/cc65.sgml
index 1079782bb..275a73168 100644
--- a/doc/cc65.sgml
+++ b/doc/cc65.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>cc65 Users Guide
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2000-09-03, 2001-10-02, 2005-08-01
 
 <abstract>
diff --git a/doc/cl65.sgml b/doc/cl65.sgml
index 2667ab555..6e044b8d5 100644
--- a/doc/cl65.sgml
+++ b/doc/cl65.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>cl65 Users Guide
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>01.08.2000, 27.11.2000, 02.10.2001
 
 <abstract>
diff --git a/doc/co65.sgml b/doc/co65.sgml
index ea75dcf7c..9d70ffe6a 100644
--- a/doc/co65.sgml
+++ b/doc/co65.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>co65 Users Guide
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>12.02.2003
 
 <abstract>
diff --git a/doc/coding.sgml b/doc/coding.sgml
index 1aa454f12..f6dfc3a35 100644
--- a/doc/coding.sgml
+++ b/doc/coding.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>cc65 coding hints
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2000-12-03, 2009-09-01
 
 <abstract>
diff --git a/doc/da65.sgml b/doc/da65.sgml
index 4dd6800d5..2b8cdb2a3 100644
--- a/doc/da65.sgml
+++ b/doc/da65.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>da65 Users Guide
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2003-08-08
 
 <abstract>
diff --git a/doc/debugging.sgml b/doc/debugging.sgml
index 7566370b9..320aa0359 100644
--- a/doc/debugging.sgml
+++ b/doc/debugging.sgml
@@ -3,7 +3,7 @@
 <article>
 
 <title>Using emulators with cc65
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>03.12.2000
 
 <abstract>
diff --git a/doc/dio.sgml b/doc/dio.sgml
index f340fa254..fe0a89983 100644
--- a/doc/dio.sgml
+++ b/doc/dio.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>Diskette Sector I/O Routines
-<author>Christian Groessler, <htmlurl url="mailto:chris@groessler.org" name="chris@groessler.org">
+<author><url url="mailto:chris@groessler.org" name="Christian Groessler">
 <date>20-Feb-2005
 
 <abstract>
diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index ba8fb8abc..85b4c266e 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>cc65 function reference
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>07.11.2002
 
 <abstract>
diff --git a/doc/geos.sgml b/doc/geos.sgml
index 8a5a948a1..d1604bc9c 100644
--- a/doc/geos.sgml
+++ b/doc/geos.sgml
@@ -5,7 +5,7 @@
 <!-- Title information -->
 
 <title>GEOSLib docs
-<author>Maciej Witkowiak, <htmlurl url="mailto:ytm@elysium.pl" name="ytm@elysium.pl">
+<author><url url="mailto:ytm@elysium.pl" name="Maciej Witkowiak">
 <date>v1.5, 26.12.1999, 2000, 2001, 2002, 2003, 2005
 <abstract>
 This is the documentation of cc65's GEOSLib, but information contained here may be also
diff --git a/doc/grc65.sgml b/doc/grc65.sgml
index d2433f65a..49d3f6798 100644
--- a/doc/grc65.sgml
+++ b/doc/grc65.sgml
@@ -4,8 +4,9 @@
 <!-- Title information -->
 
 <title>grc65 -- GEOS Resource Compiler
-<author><url name="Maciej 'YTM/Elysium' Witkowiak" url="mailto:ytm@elysium.pl">
-<and><url name="Greg King" url="mailto:gngking@erols.com">
+<author>
+<url url="mailto:ytm@elysium.pl" name="Maciej 'YTM/Elysium' Witkowiak">,<newline>
+<url url="mailto:greg.king5@verizon.net" name="Greg King">
 <date>VII 2000; VI,VII 2002; 2005-8-3
 <abstract>
 This document describes a compiler that can create GEOS headers and menues for
diff --git a/doc/index.sgml b/doc/index.sgml
index 1e78a2cdc..f9eed769d 100644
--- a/doc/index.sgml
+++ b/doc/index.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>cc65 Documentation Overview
-<author><htmlurl url="https://github.com/oliverschmidt/cc65" name="">
+<author><url url="https://github.com/cc65/cc65/">
 <date>
 
 <sect>Program documentation<p>
diff --git a/doc/intro.sgml b/doc/intro.sgml
index 1db4c0c04..d9f6c863a 100644
--- a/doc/intro.sgml
+++ b/doc/intro.sgml
@@ -3,9 +3,10 @@
 <article>
 
 <title>cc65 Compiler Intro
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">,
-<and>CbmNut, <htmlurl url="mailto:cbmnut@hushmail.com" name="cbmnut@hushmail.com">,
-<and><url name="Greg King" url="mailto:gngking@erols.com">
+<author>
+<url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">,<newline>
+<url url="mailto:cbmnut@hushmail.com" name="CbmNut">,<newline>
+<url url="mailto:greg.king5@verizon.net" name="Greg King">
 <date>2005-7-22
 
 <abstract>
@@ -285,8 +286,8 @@ Apple:
 BRUN TEST
 </verb></tscreen>
 
-You will see the "Hello, World!" appear on the same line.  Thanks to Oliver
-Schmidt, <htmlurl url="mailto:ol.sc@web.de" name="ol.sc@web.de"> for his help
+You will see "Hello, World!" appear on the same line.  Thanks to
+<url url="mailto:ol.sc@web.de" name="Oliver Schmidt"> for his help
 in completing this section.
 
 
diff --git a/doc/ld65.sgml b/doc/ld65.sgml
index 4f74b04c1..c92761c0a 100644
--- a/doc/ld65.sgml
+++ b/doc/ld65.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>ld65 Users Guide
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>02.12.2000, 02.10.2001
 
 <abstract>
diff --git a/doc/library.sgml b/doc/library.sgml
index 6c2ced433..16bd2dc5e 100644
--- a/doc/library.sgml
+++ b/doc/library.sgml
@@ -3,7 +3,7 @@
 <article>
 
 <title>cc65 Library Overview
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2000-12-02, 2002-11-26
 
 <abstract>
diff --git a/doc/lynx.sgml b/doc/lynx.sgml
index f83552e50..720c68af6 100644
--- a/doc/lynx.sgml
+++ b/doc/lynx.sgml
@@ -3,8 +3,9 @@
 <article>
 
 <title>Atari Lynx specific information for cc65
-<author>Karri Kaksonen, <htmlurl url="mailto:karri@sipo.fi" name="karri@sipo.fi">
-Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author>
+<url url="mailto:karri@sipo.fi" name="Karri Kaksonen">,<newline>
+<url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2011-04-01
 
 <abstract>
diff --git a/doc/nes.sgml b/doc/nes.sgml
index 5d465c813..b40a0d30d 100644
--- a/doc/nes.sgml
+++ b/doc/nes.sgml
@@ -3,8 +3,9 @@
 <article>
 
 <title>Nintendo Entertainment System specific information for cc65
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
-Stefan A. Haubenthal, <htmlurl url="mailto:polluks@sdf.lonestar.org" name="polluks@sdf.lonestar.org">
+<author>
+<url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">,<newline>
+<url url="mailto:polluks@sdf.lonestar.org" name="Stefan A. Haubenthal">
 <date>2005-07-17
 
 <abstract>
diff --git a/doc/od65.sgml b/doc/od65.sgml
index a1960109d..1f237b006 100644
--- a/doc/od65.sgml
+++ b/doc/od65.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>od65 Users Guide
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2010-07-30
 
 <abstract>
diff --git a/doc/pet.sgml b/doc/pet.sgml
index b0fa0e1e8..01a88c67c 100644
--- a/doc/pet.sgml
+++ b/doc/pet.sgml
@@ -3,8 +3,9 @@
 <article>
 
 <title>Commodore PET-specific information for cc65
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org"><newline>
-Stefan A. Haubenthal, <htmlurl url="mailto:polluks@sdf.lonestar.org" name="polluks@sdf.lonestar.org">
+<author>
+<url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">,<newline>
+<url url="mailto:polluks@sdf.lonestar.org" name="Stefan A. Haubenthal">
 <date>2014-03-26
 
 <abstract>
diff --git a/doc/plus4.sgml b/doc/plus4.sgml
index a16eef9d3..3a3da728a 100644
--- a/doc/plus4.sgml
+++ b/doc/plus4.sgml
@@ -3,7 +3,7 @@
 <article>
 
 <title>Commodore Plus/4 specific information for cc65
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2003-12-14
 
 <abstract>
diff --git a/doc/sp65.sgml b/doc/sp65.sgml
index 3cf749e20..909ac6d25 100644
--- a/doc/sp65.sgml
+++ b/doc/sp65.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>sp65 Users Guide
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org">
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">
 <date>2012-03-11
 
 <abstract>
diff --git a/doc/supervision.sgml b/doc/supervision.sgml
index 0aa990ac5..fcf05878e 100644
--- a/doc/supervision.sgml
+++ b/doc/supervision.sgml
@@ -3,7 +3,7 @@
 <article>
 
 <title>Watara Supervision specific information for cc65
-<author>Stefan A. Haubenthal, <htmlurl url="mailto:polluks@sdf.lonestar.org" name="polluks@sdf.lonestar.org">
+<author><url url="mailto:polluks@sdf.lonestar.org" name="Stefan A. Haubenthal">
 <date>2005-07-17
 
 <abstract>
diff --git a/doc/using-make.sgml b/doc/using-make.sgml
index 5affe3b9f..f104379f0 100644
--- a/doc/using-make.sgml
+++ b/doc/using-make.sgml
@@ -3,7 +3,7 @@
 <article>
 
 <title>Using GNU Make with cc65
-<author>Oliver Schmidt, <htmlurl url="mailto:ol.sc@web.de" name="ol.sc@web.de">
+<author><url url="mailto:ol.sc@web.de" name="Oliver Schmidt">
 <date>2009-06-26
 
 <abstract>
diff --git a/doc/vic20.sgml b/doc/vic20.sgml
index f02bd63d9..ce58dad50 100644
--- a/doc/vic20.sgml
+++ b/doc/vic20.sgml
@@ -3,8 +3,9 @@
 <article>
 
 <title>Commodore VIC20 (aka VC20) specific information for cc65
-<author>Ullrich von Bassewitz, <htmlurl url="mailto:uz@cc65.org" name="uz@cc65.org"><newline>
-Stefan A. Haubenthal, <htmlurl url="mailto:polluks@sdf.lonestar.org" name="polluks@sdf.lonestar.org">
+<author>
+<url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">,<newline>
+<url url="mailto:polluks@sdf.lonestar.org" name="Stefan A. Haubenthal">
 <date>2014-03-26
 
 <abstract>