And add the patches *sigh*