Update to gnu upstream