I guess this should be fixed in my upstream too ...