I'm running the Shell Rotella "universal" oil now, 15W40. Almost all the "diesel" oils will have both a C and S rating (C=compression ignition, i.e. diesel, S=spark ignition, i.e. gasoline) and will work fine in either engine. I have a diesel rig as well and this way I only have to buy one kind of oil. Most of the diesel oils come in gallon jugs and I find the 15W40 weight works well year-round for my climate.