update to current upstream version 2002/2009