Latest update changed somethings around, really need some autotools action or something