tracked down by jturner, I tweaked his diff to use more of upstream's original src/Makefile. ok jasper@ jturner@ abieber@