Upgrade to Standards-Version 3.9.5.
Improve watch file.