This is part of a large change submitted by Markus Friedl <markus@openbsd.org>
Submitted by: Roy Woods <roy@centricsystems.ca> Reviewed by: Andy Polyakov