Someone on comp.emacs has posted a fix.