With patch provided by Luke Dean <LukeD@pobox.com> PR: ports/123047 Submitted by: regisr <regisr@pobox.com>