Tweaks to VCS Makefile, fixes issue #2