1.58: Updated Makefile for release