Initial update into a working 5.7.1 package.