this time with the patches actually included (and properly identified!)