Include all of Martin's spec file changes