Gamma-ray bursts (GRBs) are by far the most powerful explosions in the universe. Over the past two decades, several GRB energy and luminosity correlations were discovered for long gamma-ray bursts, which are bursts whose observed duration exceeds 2 seconds. One important correlation, the Amati relation, involves the observed peak energy, E p,obs , in the νF ν spectrum and the equivalent isotropic energy, E iso . For many years, it was believed that the Amati correlation applied only to long GRBs. In this paper, we use a recent data sample that includes both long and short GRBs to re-examine the issue of whether the Amati correlation applies to long GRBs only. Our results indicate that although short bursts do not follow the Amati relation in the strict sense, they do exhibit a correlation between the intrinsic peak energy, E p,i , and E iso that is very similar to the Amati relation but with a different normalization and slope. The paper also discusses the physical interpretation of this correlation in the context of the internal shock model.