adapt patch to allow packaging of support