I've been maintaining this port for a while now.

Signed-off-by: Richard Henderson <rth@twiddle.net>