pcl-cvs fork in the road

I have a simple patch to fix an annoying bug in pcl-cvs - in particular, if you hit `a'to do a cvs add, then, prior to committing, hit `g' to update the *cvs* buffer, you get a bunch of parser errors, coming from the lines Working revision: New file! Repository revision: No revision control file which the pcl-cvs parser does not know how to handle (it's looking for a regexp which must include numeric chars). While this turns out to be quite easy to fix, I also see that Stefan Monnier has been churning out updates to pcl-cvs, and is now up to 2.9.6. While he says his package works with XEmacs, it requires some minor tweaking to actually use it (e.g. some missing `requires', adding the non-bundled file "easy-mmode.el", fixing up autoloads, adding a package-info file, etc). It does not take too much work to make this into a valid XEmacs package. So my question is, should I submit the patches to fix bugs in the R-2_0-Beta_2 version that we ship, or should I submit patches to sync our pcl-cvs package with Stefan Monnier's 2.9.6 substantially reworked 2.9.6 version?