I installed the engine from a 96 XT600E,
into the 84/5 XT600 Tenere,
The engine fits perfectly,
You need to take the front spocket, fit it with the Shoulder towards the engine, and "Shave off" about 3-4mm in order to get it closer to the engine.
there is one m6 bolt you have to replace with a Counter sink bolt, else the chain will eat it up.
Space the rear sprocket out by about 3mm.
Also need to make small changes to the plumbing from the oil tank to the engine. (The 96 have the oil in the frame versus the 85 where the oil tank is on the rear subframe - left.
I also used the complete wiring harness off the 96 XT, which meant I did not have to do any changes to the charging system, and I fitted the 96 XT battery below the rear carrier. It's too big for the original batt box.
Exhaust is exactly the same,
Tubes from the airbox to the carbs had to be modified slightly.