Refurbished to match new make.conf capabilities

This fixes issue #1.