Fixing for work on ubuntu and update to 6.0.9 squeeze