Another option might be to change the "package" target to actually be "repackage".