add packaging fixes yet-to-be merged in apsu's tree