Additional improvement towards 'make dist'

Not quite there yet, but closer when comparing github copy to dist copy.
Merge pull request #1118 from JoesCat/master

Additional improvement towards 'make dist'