mrd6: remove invasive stuff from patch 001 and rename it, Makefile cleanup