The release of upcoming ICD-11 results in important changes to the classification of stress-related mental disorders. With the aim to improve clinical utility there is a new organizational structure for the different disorders as they are now categorized by the response to specific types of stressors. These range from reactions based on the experience of psychosocial strains (adjustment disorder), to grief reactions with a need for treatment (prolonged grief disorder) and reactions after exposure to traumatic events (posttraumatic stress disorder), also with more complex clinical picture (complex posttraumatic stress disorder). This article gives an overview of the major changes in the shift in disorder categorization from ICD-10 to ICD-11. This includes prevalence rates, if available, as well as suggestions of measurement instruments for the purpose of clinical diagnostics. Furthermore, ongoing discussions among the research community will be considered.