0.5.4 solaris backport