Update for new organization of gnu tree.