changes for ease-of-packaging at mageia and others