adapt upstream changes
Merge pull request #551 from yast/oss_clean

adapt upstream changes