update from -current:

From henning@:
Log message:
need errno, thx sthen