Liedermacher

someone who writes the lyrics and usually the music of songs