The original commit has been slightly tuned so that it builds with the code in the latest stable release. Approved by: makc (maintainer)