Vaginal spasm has been considered the defining diagnostic characteristic of vaginismus for approximately 150 years. This remarkable consensus, based primarily on expert clinical opinion, is preserved in the DSM-IV-TR. The available empirical research, however, does not support this definition nor does it support the validity of the DSM-IV-TR distinction between vaginismus and dyspareunia. The small body of research concerning other possible ways or methods of diagnosing vaginismus is critically reviewed. Based on this review, it is proposed that the diagnoses of vaginismus and dyspareunia be collapsed into a single diagnostic entity called "genito-pelvic pain/penetration disorder." This diagnostic category is defined according to the following five dimensions: percentage success of vaginal penetration; pain with vaginal penetration; fear of vaginal penetration or of genito-pelvic pain during vaginal penetration; pelvic floor muscle dysfunction; medical co-morbidity.