update to 2.5 + patch for tempfiles