Diff originally from Gleydson Soares <gsoares at gmail dot com>, who also takes maintainership. Thanks! Tweaks from kili@ (the Makefile nazi) and myself. ok kili@
