FL-357: add more sabayon stuff