PR: ports/69187 Submitted by: Ports Fury
based on: PR: 47098 Submitted by: Tim Martin <tmartin@andrew.cmu.edu>