For PR automake/358: