We show how dynamic nuclear polarization (DNP) enhanced solid-state NMR spectroscopy can be used to characterize polymorphs and solvates of organic solids. We applied DNP to three polymorphs and one hydrated form of the asthma drug molecule theophylline. For some forms of theophylline, sample grinding and impregnation with the radical-containing solution, which are necessary to prepare the samples for DNP, were found to induce polymorphic transitions or desolvation between some forms. We present protocols for sample preparation for solid-state magic-angle spinning (MAS) DNP experiments that avoid the polymorphic phase transitions in theophylline. These protocols include cryogrinding, grinding under inert atmosphere, and the appropriate choice of the impregnating liquid. By applying these procedures, we subsequently demonstrate that two-dimensional correlation experiments, such as H-1-C-13 and H-1-N-15 HETCOR or C-13-C-13 INADEQUATE, can be obtained at natural isotopic abundance in reasonable times, thus enabling more advanced structural characterization of polymorphs.