Pretty sure. That's definitely right for the rear. Try checking the Yam part numbers on ajsutton.co.uk to be sure it's the same for the front.

__________________
I spent a lot of money on travel and racing motorcycles - the rest I just squandered.

XT660Z - Commuter, Adventurer...Racer?

www.dashmoto.net

Other bikes >> MT-03 / CG125BR-J / ER-6F
Departed >> ZXR400L3 / EC300 / DR-Z400E / DR800S / GPZ500S / GS400