Fix bug 876833 - Update make-api module and usage