Submitted by: Kazuo Horikawa <horikawa@jp.freebsd.org>
Submitted by: Sandro Sigala <sandro@cat.local.net> as part of PR# 2134