r9960: update for openmcl