patch from Guenther Deschner <gd@suse.de>