diff --git a/kernel.spec b/kernel.spec
index 05fd6e6..49cdf4e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -170,8 +170,10 @@ Summary: The Linux kernel
 
 %if 0%{?stable_rc}
 %define stable_rctag .rc%{stable_rc}
+%define pkg_release 0%{stable_rctag}.%{fedora_build}%{?buildid}%{?dist}
+%else
+%define pkg_release %{fedora_build}%{?buildid}%{?dist}
 %endif
-%define pkg_release %{fedora_build}%{?stable_rctag}%{?buildid}%{?dist}
 
 %else
 
@@ -2122,6 +2124,10 @@ fi
 # and build.
 
 %changelog
+* Fri Nov 11 2011 Chuck Ebbert <cebbert@redhat.com>
+- Use the same naming scheme as rawhide for -stable RC kernels
+  (e.g. 3.1.1-0.rc1.1 instead of 3.1.1-1.rc1)
+
 * Fri Nov 11 2011 Josh Boyer <jwboyer@redhat.com> 3.1.1-1
 - Linux 3.1.1