Switch to 2.1.5 and modify make file.