- enable SEPARATE_BUILD while here - drop some patches merged upstream. With some tweaks and OK from sthen@ (MAINTAINER)