Add support for Make 4.1