Bootstrap using my modifications to package-build