Improve dobrochan support. Fixes #650.