Merge pull request #634 from micmac1/fs-modmake-patch