Apply patch kindly given us by Raspberry Pi maintainers: http://pastebin.com/JfDuU6sj