Patch by matz@suse.de: