update to upstream + makefile & distinfo to match