Fixed Makefile for 4.8!