This paper presents a new procedure to estimate the diffusion tensor from a sequence of diffusion-weighted images. The first step of this procedure consists of the correction of the distortions usually induced by eddy-current related to the large diffusion-sensitizing gradients. This correction algorithm relies on the maximization of mutual information to estimate the three parameters of a geometric distortion model inferred from the acquisition principle. The second step of the procedure amounts to replacing the standard least squares-based approach by the Geman–McLure M-estimator, in order to reduce outlier-related artefacts. Several experiments prove that the whole procedure highly improves the quality of the final diffusion maps.