PR: ports/8516 and ports/9080 Submitted by: John Saunders <john@nlc.net.au> Submitted by: Neil Blakey-Milner <nbm@rucus.ru.ac.za>