Fix dependencies so that `make -j` works

Also bump ready for a 2.6 tag.