Patch from nick@cpanel.net