This fixes the FTBFS of 9.6.1-1 for me, at least on i386 and amd64. A similar fix (4 lines) seems to work for 9.8.4-2, but this never made it to testing (From looking at the logs, from more or less the same bug). A TPU upload of 9.6.1-1squeeze1 would require removing 9.6.1 sparc from unstable. A TPU upload 9.8.4-3 would require sid-removals of sparc, hppa, mips, mipsel, s390 and ia64.