Bring up to current p6 require spec.