- fix files listed twice
- rel 6