Log Message:
Add some patches to fix some compile/install errors and make sure to actually
install the zip file if it's there.