More debian unstable hacks.