updated with upstream tarball (instead of CVS HEAD) and updated the required patch