Here's a diff/patch I made off a freash git clone with the changes mentioned and some makefile changes I used.