revise patches and configure.ac etc.