S390 support from susanne - PR for travis fun