We document a new stylized fact regarding the dynamics of the commodity convenience yield: the volatility of the convenience yield is heteroskedastic for industrial commodities; specifically, the volatility (variance) of the convenience yield depends on the convenience yield level. To explore the economic and statistical significance of the improved specification of the convenience yield process, we propose an affine model with three state variables (log spot price, interest rate, and the convenience yield). Our model captures three important features of commodity futures—the heteroskedasticity of the convenience yield, the positive relationship between spot-price volatility and the convenience yield and the dependence of futures risk premium on the convenience yield. Moreover our model predicts an upward sloping implied volatility smile, commonly observed in commodity option market.