- adapt to rpm5 (thanks to Qing He and Mark Hatle)