Better handling of binary files (bug #8495)