Copying over modifications to support SuSE from the 1.7 branch.