Also based on the two upstream zip archives (src and data)
with file permissions fixed and text files in UNIX format.