This paper extends existing commodity valuation models to allow for stochastic volatility and simultaneous jumps in the spot price and spot volatility. Closed-form valuation formulas for forwards, futures, futures options, geometric Asian options and commodity-linked bonds are obtained using the Heston (1993) and Bakshi and Madan (2000) methodology. Stochastic volatility and jumps do not affect the futures price at a given point in time. However, numerical examples indicate that they play important roles in pricing options on futures.