Fix the linaro mess