Second try at the patch, with ChangeLogs and msdos build system changes included.