Sync from Automake, as follows: