Adjust for new configuration file, and add native eol handling.