Update to 9.5.4, clean spec