fix jhs/build-couchdb#24, fix jhs/build-couchdb#26