use fatalx() not errx()
Merge branch 'master' into portable