PR: ports/76416 Submitted by: Florent Thoumie <flz@xbsd.org>
(Part 1)
PR: ports/60868 Submitted by: Martijn Lina <martijn@pacno.net>