The repowering of already installed wind farms is considered one of the most promising and cost-effective short-term strategies to scale-up wind capacity. In this study, we apply Markowitz's mean-variance (MV) portfolio optimization theory to explore alternative repowering actions in Spain. The efficient portfolios - a direct outcome of the MV optimization - offer optimal repowering alternatives to current wind farm generation mixes. They deliver the highest possible average power output (yield) for a given level of supply risk. Different repowering scenarios are considered in this paper that range from a full restructuring of the existing wind generation mix to restricting by certain amounts the percentage of down-/uprating of each reference region. Results show that, depending on the configuration of the MV portfolio optimization problem, hourly fluctuations in the aggregate power supply can be reduced as much as 12-31%, while retaining the current level of energy productivity. In addition, for the level of energy supply risk experienced with the existing portfolio of Spanish wind farms; we can derive more efficient mixes that boost-up productivity by 16-55%. This work aims at providing valuable insight for energy policy-making in the direction of optimally repowering future renewable generation. (C) 2017 Elsevier Ltd. All rights reserved.