I saw him do that one, in front of a German audience, at a festival called "Volk in den Bergen", back in 1979. I thought the last line was, "And tomorrow I shall gripe again". I could be wrong though... It was very funny and it was quite amazing to watch him make it work so well in front of a German audience.
I saw Dick Gaughan there too. He came over as a bit of a hard case. But boy could he sing and play!