Changes for debian-3.84