New version from: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641485#15