Updating: no messing with automake anymore