Ok, here goes.

Same patch, updated ChangeLog entry.