Perhaps we need to have a concept of separation of upstream and distros.