ported patch 5 from http://patchwork.coreboot.org/user/bundle/37/