original diff by rsadowski@ with tweaks by me ok sthen@ dcoppa@ bulk build by naddy@ maintainer timeout