Applying package changes from Debain developer
Backport package for wheezy