Apply our local changes bringing us up to 3.95 (for which there is norelease tar), and add build glue.