This is the patch as supplied, which needs work and as of yet doesn't
compile on non-unix. Fixes pending. -- jpd