The accurate assessment of sexual fantasy use is important for both research and forensic/clinical practice. Although a number of sexual fantasy questionnaires exist, they tend to be associated with high financial cost for researchers, outdated or ambiguous terminology, and/or embody ethical problems arising from overtly explicit items. One measure that does not contain these issues is Gray et al.’s (2003) Sexual Fantasy Questionnaire (SFQ). While the SFQ has recently gained some interest from researchers, it has not been thoroughly validated. Thus, in this study, we combined data from three online survey-based samples (N = 594) to examine the factor structure underpinning the SFQ. After conducting parallel and principal components analyses, a six-factor structure was settled upon. The resulting SFQ-revised contained 62-items, with the six factors reflecting the following fantasy themes: (1) masochistic, (2) sadistic, (3) romantic, (4) impersonal, (5) pre/tactile courtship disorder, and (6) bodily function. Data on how the six clusters differ across genders, sexual orientation, and relationship status are also provided. We also developed a short version of the SFQ-revised (37-items) for use when time or space are constrained. The theoretical and methodological significance of the revised SFQs are discussed, as well as recommendations for research and practice.