Add old patch from Robert Dahlem <Robert.Dahlem@ffm2.siemens.de> to