After some two decades of inattention, the issue of energy security once again moved to the top of the policy agenda in Germany in the mid-2000s. After briefly achieving renewed prominence, however, it was eclipsed in German energy policy, at least temporarily, by heightened concerns about climate change. This paper explains the re-emergence of concerns about energy insecurity in recent years as well as the reasons for their subsequent overshadowing. It describes and explains the steps that have been taken during this period to promote German energy security and analyzes their adequacy. The paper identifies a number of reasons to be skeptical about how much the agreed policies will improve Germany's energy security, but it concludes that there are nevertheless good reasons to expect the issue to regain the attention of policy-makers in the future.