Backport to build on wheezy
Updated changelog