Better make-fu

Thanks @cmr. :heart