Apply patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=609457