Classification has played a major role in the diagnosis of primary headache conditions including migraine with and without aura. With many updates and changes, the International Classification of Headache Disorders (ICHD)-3 beta is currently considered as the gold standard for classification of migraine and other headaches. Correct diagnosis of migraine and its subtypes is a first step toward appropriate treatment and crucial to minimizing disability and optimizing health-related quality of life. The ICHD-3 beta version represents the state of the art in migraine diagnosis but is expected to evolve as biological knowledge advances. Future research should focus on identification of biologically homogeneous subgroups of migraine based on genes and biomarkers.