diff --git a/kernel.spec b/kernel.spec
index f04da4a..274079e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1766,7 +1766,11 @@ BuildKernel() {
 %if %{signmodules}
     # Save off the .tmp_versions/ directory.  We'll use it in the 
     # __debug_install_post macro below to sign the right things
+    # Also save the signing keys so we actually sign the modules with the
+    # right key.
     cp -r .tmp_versions .tmp_versions.sign${Flavour:+.${Flavour}}
+    cp signing_key.priv signing_key.priv.sign${Flavour:+.${Flavour}}
+    cp signing_key.x509 signing_key.x509.sign${Flavour:+.${Flavour}}
 %endif
 
     # remove files that will be auto generated by depmod at rpm -i time
@@ -1913,6 +1917,8 @@ find Documentation -type d | xargs chmod u+w
       Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-PAE.config | cut -b 3-` \
       rm -rf .tmp_versions \
       mv .tmp_versions.sign.PAE .tmp_versions \
+      mv signing_key.priv.sign.PAE signing_key.priv \
+      mv signing_key.x509.sign.PAE signing_key.x509 \
       make -s ARCH=$Arch V=1 INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_sign KERNELRELEASE=%{KVERREL}.PAE \
       %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.PAE/extra/ \
     fi \
@@ -1921,6 +1927,8 @@ find Documentation -type d | xargs chmod u+w
       Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-debug.config | cut -b 3-` \
       rm -rf .tmp_versions \
       mv .tmp_versions.sign.debug .tmp_versions \
+      mv signing_key.priv.sign.debug signing_key.priv \
+      mv signing_key.x509.sign.debug signing_key.x509 \
       make -s ARCH=$Arch V=1 INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_sign KERNELRELEASE=%{KVERREL}.debug \
       %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.debug/extra/ \
     fi \
@@ -1929,6 +1937,8 @@ find Documentation -type d | xargs chmod u+w
       Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-PAEdebug.config | cut -b 3-` \
       rm -rf .tmp_versions \
       mv .tmp_versions.sign.PAEdebug .tmp_versions \
+      mv signing_key.priv.sign.PAEdebug signing_key.priv \
+      mv signing_key.x509.sign.PAEdebug signing_key.x509 \
       make -s ARCH=$Arch V=1 INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_sign KERNELRELEASE=%{KVERREL}.PAEdebug \
       %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.PAEdebug/extra/ \
     fi \
@@ -1937,6 +1947,8 @@ find Documentation -type d | xargs chmod u+w
       Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}.config | cut -b 3-` \
       rm -rf .tmp_versions \
       mv .tmp_versions.sign .tmp_versions \
+      mv signing_key.priv.sign signing_key.priv \
+      mv signing_key.x509.sign signing_key.x509 \
       make -s ARCH=$Arch V=1 INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_sign KERNELRELEASE=%{KVERREL} \
       %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/extra/ \
     fi \
@@ -2326,6 +2338,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Nov 14 2012 Josh Boyer <jwboyer@redhat.com>
+- Fix module signing of kernel flavours
+
 * Tue Nov 13 2012 Josh Boyer <jwboyer@redhat.com>
 - Add patch from David Howells to fix header guards on installed kernel headers