With housekeeping

Statically built on ubuntu trusty after this commit:

I am in a hurry google@6ed452f