This paper outlines the approach that the WHO's Family of International Classifications (WHO-FIC) network is undertaking to create ICD-11. We also outline the more focused work of the Quality and Safety Topic Advisory Group, whose activities include the following: (i) cataloguing existing ICD-9 and ICD-10 quality and safety indicators; (ii) reviewing ICD morbidity coding rules for main condition, diagnosis timing, numbers of diagnosis fields and diagnosis clustering; (iii) substantial restructuring of the health-care related injury concepts coded in the ICD-10 chapters 19/20, (iv) mapping of ICD-11 quality and safety concepts to the information model of the WHO's International Classification for Patient Safety and the AHRQ Common Formats; (v) the review of vertical chapter content in all chapters of the ICD-11 beta version and (vi) downstream field testing of ICD-11 prior to its official 2015 release. The transition from ICD-10 to ICD-11 promises to produce an enhanced classification that will have better potential to capture important concepts relevant to measuring health system safety and quality-an important use case for the classification.