We prove that for general smooth cost functions on the Euclidean space, or for the cost given by the squared distance on a Riemannian manifold, optimal transport maps between smooth densities are smooth outside a closed set of measure zero.(joint work with Alessio Figalli).