Modify 1.8.7-352 to build on FC18