PR: ports/56505 Submitted by: Espen Skoglund <esk@ira.uka.de>
PR: 51739 Submitted by: David Yeske <dyeske@yahoo.com>