Collecting another little patch from gd@suse.de