Upstream bump and fix build on Debian squeeze

Signed-off-by: Alin Dobre <alin.dobre@elastichosts.com>