[antognini]

You're correct. It's thought that long GRBs originate in certain kinds of supernovae. (What kinds of supernovae specifically isn't really known.) Short GRBs are thought to originate in mergers between neutron stars.