added mandriva use case + few minor changes