How do market diffusions of plug-in electric vehicles and their charging infrastructure interact? And what is a sufficient number of public charging stations to overcome a potential lock-in? In this thesis, an agent-based simulation model is introduced to answer this question for Germany until 2030. The inclusion of different charging options and electric drive trains allows a realistic picture of the market diffusion.