- rel 3; use upstream fixes instead of (broken) debian ones