Updated Makefile, patch file.