A musician who both sings and composes, especially when recording or performing his/her own compositions.
One who writes songs.
A man who sings songs, especially as a profession; a male singer.
A male songbird.
A book of songs; songbook.