A process for upgrading of unstable olefins, naphthas, and dienes, such as coker naphthas, is disclosed. The olefins in the unstable naphthas are oligomerized over a shape selective zeolite to gasoline and distillate products. The dienes are catalytically converted by the same zeolite. Preferably, hydrogen is added to increase catalyst life. Feed pretreatment, to remove basic nitrogen compounds also improves catalyst life. Water washing of coker naphtha is the preferred method of removing basic nitrogen compounds.