Add preparation for provider (bug 942361)

Also this domain is also used by marketplace.