More for PR automake/38: