Makefile now uses D7.31