Add forgotten bit of txz->tgz package format switch
Add hack for running CURRENT builds on 9.x