Mandrake packaging updates from Buchan & Sly