Please let me know if there's something wrong with my last patch (https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=740161;filename=740161.patch;msg=21) and I will try to update it.