Abstract. The present status of the shear-free fluid conjecture in general relativity is discussed: a review is given of recent partial proofs, a new and complete proof is given for the case of a linear equation of state, including a non-zero cosmological constant, and a number of useful results are presented which might help in proving the conjecture for a general equation of state.