synced with Ubuntu packager