I use *just* more-wl. I always assumed it included anything from the cvs...
Afaict it's about a year out-of-date