added patch from Andreas Fuchs <asf@void.at> to prevent apply errors