etags.el - sync or update?

I'm finding that the XEmacs tags facility is having trouble dealing with the TAGS files generated by a lot of the packages I work with (glibc, gtk, mozilla, gnome, etc...) because of the increasing popularity of the ",include" syntax, which our etags.el does not support. I started hacking on etags.el a while back and have kludged it up to handle ,included TAGS files, but I'm not too happy with my implementation. I recently downloaded the latest GNU emacs and it handles the new-style TAGS files without a hitch. Of course, it is also substantially different from ours. I'm volunteering to do something about the etags facility (it scratches a personal itch) but I'm looking for suggestions, should I consider just syncing ours to the latest FSF version, or should I try to clean up the XEmacs version? Any comments or suggestions are welcome.