merged from stable6 (opensuse instructtions)