The Manual on Effective Investigation and Documentation of Torture and Other Cruel, Inhuman or Degrading Treatment or Punishment, commonly known as the Istanbul Protocol, is an interdisciplinary standard supported by, among others, the United Nations and the World Medical Association. It aims at aiding the fight against torture by giving clear guidelines to ensure better and more effective assessment of physical and psychological sequels. Mental health is a key aspect of diagnostical assessment and documentation due to the severe and frequently long-lasting impact of torture that often lasts longer than physical sequels. The inclusion of psychological aspects and a psychiatric diagnosis is to be treated as an important obligatory. Care must be taken to avoid common pitfalls. The new and substantial revisions in the frequently used but also criticised Diagnostical and Statistical Manual (DSM) reflect challenges and opportunities in a comprehensive approach to the documentation of torture.