This is simply an updated .patch from the most recent release;
it patches cleanly into 3.1. If you use this be aware that you
still have to manually create the directory tree for the pfiles.
 (lib/pfiles and lib/pfiles/[a-z])