PATCHes followup, new dist dir to support packaging