Update to work with latest clib(1)