s3cfb: update from crespo