applied Whoopie's patch for all, not just debian