diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index 1e89556..181d292 100644
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 24 23:21:22 UTC 2013 - jeffm@suse.com
+
+- Moved amd-ucode from microcode_ctl into new ucode-amd package.
+
 -------------------------------------------------------------------
 Fri Jul 19 13:21:50 UTC 2013 - jeffm@suse.com
 
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index 178fd1f..08dce19 100644
--- a/kernel-firmware.spec
+++ b/kernel-firmware.spec
@@ -71,7 +71,14 @@ This package contains the firmware for in-kernel drivers that was
 previously included in the kernel. It is shared by all kernels >=
 2.6.27-rc1.
 
+%package -n ucode-amd
+Supplements:    modalias(x86cpu:vendor:0002:family:*:model:*:feature:*)
+Summary:        Microcode updates for AMD CPUs
+Group:          System/Kernel
 
+%description -n ucode-amd
+
+This package contains the microcode files used by AMD CPUs.
 
 %prep
 %setup -q -c kernel-firmware -a 2
@@ -88,6 +95,10 @@ rm -f %{buildroot}/lib/firmware/WHENCE
 bash %_sourcedir/firmware.sh --kill-duplicates %buildroot/lib/firmware/
 %fdupes %{buildroot}
 rm -f find_supplements.cache
+# In alsa-firmware
+rm -f %{buildroot}/lib/firmware/ctefx.bin
+rm -f %{buildroot}/lib/firmware/ctspeq.bin
+# Devel files
 rm -rf %{buildroot}/lib/firmware/carl9170fw
 
 %clean
@@ -96,6 +107,13 @@ rm -rf %{buildroot}
 %files
 %defattr(0644,root,root,0755)
 %doc WHENCE README GPL-3 LICENCE.*
+%exclude /lib/firmware/amd-ucode/microcode_amd.bin
+%exclude /lib/firmware/amd-ucode/microcode_amd_fam15h.bin
 /lib/firmware/*
 
+%files -n ucode-amd
+%defattr(0644,root,root,0755)
+/lib/firmware/amd-ucode/microcode_amd.bin
+/lib/firmware/amd-ucode/microcode_amd_fam15h.bin
+
 %changelog