I was able to turn off the spicket, shake once, and be done with it. Now, I have to shake it for for an few extra seconds or else I get a little surpise down my leg. Will it get worse and diapers are soon to follow? Is there something I can do about it?

Probably nothing but have your postate checked.

http://web.ukonline.co.uk/ruth.livingstone/little/prost2.htm#symptoms

try kegels

Problems like this are common as you get older. There are a variety of situations and possibilities. Definitely see a urologist.