This paper studies optimal linear and non-linear income taxes and education subsidies in two-type models with endogenous human capital formation, endogenous labor supply, and endogenous wage rates. Assuming constant human capital elasticities, human capital investment should be efficient under optimal linear policies, whether general equilibrium effects are present or not. Hence, education subsidies should not be used for distributional reasons. Due to general equilibrium effects, optimal linear income taxes may even become negative. Optimal non-linear policies exploit general equilibrium effects for redistribution. The high-skilled type optimally has a negative marginal income tax rate and a positive marginal education subsidy. The low-ski...