Import wip from pkgsrc-wip 2014-04-01 18:10 CEST