Update to latest upstream, Modify Make Config Options