Thanks to Cyrus Rahman <cr@demo.jcmax.com> for his patches. PR: ports/6938
Submitted by: Donald Burr <dburr@POBoxes.com>