I have an 04 950 that did this. It would make a lot of noise, and after about a year of being told the noise was "normal " the oil light started coming on when the engine temp was hot. i figured that was not normla! I replaced the entire oil pump (spring, piston, housing,etc) for about $60 and it solved all my problems. The engine still clakety claks but its not nearly as loud.
Wind in my hair, bugs in my teeth!