The American Psychiatric Association (APA) recently completed a several year process of revising the fifth edition of the Diagnostic and Statistical Manual of Mental Disorders (DSM-5). During that time, there were objections raised to retaining DSM's gender identity disorder diagnoses and calls to remove them, just as homosexuality had been removed from DSM-II in 1973. At the conclusion of the DSM-5 revision process, the gender diagnoses were retained, albeit in altered form and bearing the new name of 'gender dysphoria'. The author of this paper was a member of the DSM-5 Workgroup on Sexual and Gender Identity Disorders and presently serves on the WHO Working Group on Sexual Disorders and Sexual Health. Both groups faced similar tasks: reconciling patients' needs for access to care with the stigma of being given a psychiatric diagnosis. The differing nature of the two diagnostic manuals led to two different outcomes. As background, this paper updates the history of homosexuality and the gender diagnoses in the DSM and in the International Statistical Classification of Diseases and Related Health Problems (ICD) as well as what is expected to happen to the homosexuality and gender diagnoses following the current ICD-11 revision process.