diff --git a/.gitignore b/.gitignore
index 2a459583a..98392fa4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ linux-*.tar.bz2
 patch-*.bz2
 clog
 *.rpm
+*.orig
 kernel-[23].*/
diff --git a/kernel.spec b/kernel.spec
index f93eaac55..5bdb7e21d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -173,8 +173,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
 
@@ -2055,6 +2057,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %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>
 - Add reworked pci ASPM patch from Matthew Garrett