In this paper, we proposed a simple frequency discriminator based method to automatically identify PSK and M-ary FSK modulation schemes. This method is simpler than other methods based on statistical moments, neural networks and wavelet transforms. Also, this method can demodulate M-ary FSK signals using the classifier's output, resulting in a simple receiver structure. Results from a digital implementation are presented to show the validity of the proposed method.