Same patch, with ChangeLog entries.