In the last decade, the share of renewable energy sources in the energy mix has risen significantly in many countries, and the large-scale integration of these intermittent energy sources constitutes a major challenge to the power grid. A crucial building block of a successful transformation of today's energy systems is the use of energy storage, either co-located with renewable energy sources or on a grid-level. To this end, we present a model on the basis of a Markov Decision Process for the short-term trading of intermittent energy production co-located with energy storage. The model explicitly considers the time lag between trade and delivery of energy, which is characteristic for energy markets. Our storage representation includes asymmetrical conversion losses, asymmetrical power, and self-discharge. Stochastic production and market prices are represented by ARIMA processes, and the producer may also undertake price arbitrage by purchasing energy on the market when prices are comparatively low. Regarding the solution of our model, we develop several intuitive and easily interpretable decision rules that can be readily applied in practice. An extensive numerical study, based on real-world data, confirms the excellent performance of these rules in comparison to a sophisticated Approximate Dynamic Programming algorithm adapted from literature. (C) 2017 Elsevier Ltd. All rights reserved.