There is increasing empirical evidence that people systematically differ in their rates of return on capital. We derive optimal non-linear taxes on labor and capital income in the presence of such return heterogeneity. We allow for two distinct reasons why returns are heterogeneous: because...