Add the character set to the dispatcher.

Note that the line-endings were also changed in this commit.