Bleeding jumbo: two small fixes for make -f Makefile.orig