Objective-Substance use disorders (SUDs) are common among patients presenting to general psychiatry treatment settings, and thus it is important that all psychiatry residents be well-trained in the screening, diagnosis, and treatment of outpatients with these problems. Nonetheless, there is a relative shortage of trained addiction psychiatry staff to meet residents' educational needs.Methods-The authors describe an addiction psychiatry curriculum within a general psychiatry training program to demonstrate practical approaches to educating general psychiatry residents on the treatment of SUDs.Results-The MGH/McLean adult psychiatry residency training program provides training in addiction psychiatry in multiple treatment settings during the four years of residency. The program uses addiction specialists, non-specialty psychiatrists, and residents and fellows to provide training.Conclusions-Adult psychiatry residencies can provide comprehensive addiction psychiatry training that spans multiple treatment settings and post-graduate years. This can be accomplished by training general staff psychiatrists, senior residents, and fellows to assist core addiction faculty in providing addiction psychiatry education.