I think this should work, together with the apache log changes.