Can we have "addremove" changes on trunk? In tarball snapshot?