This paper summarizes the major strengths and weaknesses of current psychiatric nosology, and then discusses various forms of masochistic behavior as one illustration of how psychoanalysis can contribute to the continuing evolution of psychiatric nosology. Masochistic behavior is separated into behavior in which there is a predominantly conscious link between pleasure and pain, and behavior in which that link is predominantly unconscious. Both categories are further separated into normal and pathological forms. The current diagnostic category of dysthymic disorder is then discussed, with consideration given to the contribution that psychoanalysis can make toward the clarification and delineation of this heterogeneous diagnostic category.