Log Message: Restore Joerg's build fix patch, which the previous update dropped, and drop patch-ab, which doesn't exist. HI MANU