In this review, we discuss critically recent research on the acceleration of the solar wind, giving emphasis to high-speed solar wind streams emanating from solar coronal holes. We first explain why thermally driven wind models constrained by solar and interplanetary observations encounter substantial difficulties in explaining high speed streams. Then, through a general discussion of energy addition to the solar wind above the coronal base, we indicate a possible resolution of these difficulties. Finally, we consider the question of what role MHD waves might play in transporting energy through the solar atmosphere and depositing it in the solar wind, and we conclude by examining, in a simple way, the specific mechanism of solar wind acceleration by Alfven waves and the related problem of accelerating massive stellar winds with Alfven waves.