use patch from bnc#796918 for fix to 20-files..