Updated for 1.5.22 from FreeBSD Ports