Updated patch to build correctly under 6.3p1.