In the past, addiction disorders were considered to be mainly substance use disorders. The main focus has been on dependence disorders. Dependence criteria do not differ substantially in the two main classification systems ICD and DSM, while harmful use (ICD) and abuse (DSM) criteria show much less concordance. Presently diagnostic criteria for behavioral addiction disorders are only available for pathological gambling, however, under the category of disorders of impulse control, while other disorders have to be categorized under disorders not otherwise specified. Evidence of neurobiological similarities implies that future ICD and DSM revisions, in addition to other needed changes, will group behavioral addiction and substance use disorders together.