diff --git a/.gitignore b/.gitignore
index dc6636f..52465ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ microcode-20100826.dat
 /microcode-20101123.dat
 /amd-ucode-2011-01-11.tar
 /microcode-20110428.dat
+/intel-microcode2ucode.c
diff --git a/microcode_ctl.rules b/microcode_ctl.rules
index f6068d0..96f4dda 100644
--- a/microcode_ctl.rules
+++ b/microcode_ctl.rules
@@ -1,2 +1 @@
 KERNEL=="cpu[0-9]*", ACTION=="add", RUN+="/sbin/modprobe microcode"
-KERNEL=="devices/platform/microcode", ACTION=="add", RUN+="/sbin/microcode_ctl -Qu"
diff --git a/microcode_ctl.spec b/microcode_ctl.spec
index f232fa0..5469836 100644
--- a/microcode_ctl.spec
+++ b/microcode_ctl.spec
@@ -1,7 +1,7 @@
 Summary:        Tool to update x86/x86-64 CPU microcode.
 Name:           microcode_ctl
 Version:        1.17
-Release:        17%{?dist}
+Release:        18%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+ and Redistributable, no modification permitted
@@ -13,6 +13,8 @@ Source1:        microcode_ctl.rules
 Source2:        microcode-20110428.dat
 # http://www.amd64.org/support/microcode.html
 Source3:        amd-ucode-2011-01-11.tar
+# Tool for splitting Intel's microcode file
+Source4:        intel-microcode2ucode.c
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Requires:       udev
 Requires(pre):  /sbin/chkconfig /sbin/service
@@ -33,6 +35,7 @@ tar xf %{SOURCE3}
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+gcc -Wall -o intel-microcode2ucode %{SOURCE4}
 
 %install
 rm -rf %{buildroot}
@@ -48,13 +51,18 @@ rm -rf %{buildroot}/etc/*
 
 mkdir -p %{buildroot}/lib/udev/rules.d
 install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d/89-microcode.rules
-install -m 644 %{SOURCE2} %{buildroot}/lib/firmware/microcode.dat
 
 install -m 644 amd-ucode-2011-01-11/microcode_amd.bin %{buildroot}/lib/firmware/amd-ucode/microcode_amd.bin
 install -m 644 amd-ucode-2011-01-11/LICENSE LICENSE.microcode_amd
 install -m 644 amd-ucode-2011-01-11/README README.microcode_amd
 install -m 644 amd-ucode-2011-01-11/INSTALL INSTALL.microcode_amd
 
+install -m 755 intel-microcode2ucode %{buildroot}/sbin
+%{buildroot}/sbin/intel-microcode2ucode %{SOURCE2}
+chmod 0755 intel-ucode
+mv intel-ucode %{buildroot}/lib/firmware
+rm %{buildroot}/lib/firmware/microcode.dat
+
 chmod -R a-s %{buildroot}
 
 %clean
@@ -65,6 +73,7 @@ rm -rf %{buildroot}
 /lib/firmware/*
 /lib/udev/rules.d/*
 /sbin/microcode_ctl
+/sbin/intel-microcode2ucode
 %doc LICENSE.microcode_amd README.microcode_amd INSTALL.microcode_amd
 %attr(0644,root,root) %{_mandir}/*/*
 
@@ -74,6 +83,10 @@ exit 0
 
 
 %changelog
+* Thu Aug 04 2011 Anton Arapov <anton@redhat.com> 1.17-18
+- Ship splitted microcode for Intel CPUs [#690930]
+- Include tool for splitting microcode for Intl CPUs (Kay Sievers )
+
 * Thu Jun 30 2011 Anton Arapov <anton@redhat.com> 1.17-17
 - Fix udev rules (Dave Jones ) [#690930]
 
@@ -114,7 +127,7 @@ exit 0
 - Fix the udev rules (Harald Hoyer )
 
 * Mon Mar 22 2010 Anton Arapov <anton@redhat.com> 1.17-2
-- Make microcode_ctl event driven (Bill Nottingham ) Resolves rhbz#479898
+- Make microcode_ctl event driven (Bill Nottingham ) [#479898]
 
 * Thu Feb 11 2010 Dave Jones <davej@redhat.com> 1.17-1.58
 - Update to microcode-20100209.dat
diff --git a/sources b/sources
index efaf68f..2a0ba9f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 aa9ed7a490f37e0d250ca46d0f31682b  amd-ucode-2011-01-11.tar
 8e1a2cf8a782fab8db7466f548d37b9b  microcode-20110428.dat
 98a7f06acef8459c8ef2a1b0fb86a99e  microcode_ctl-1.17.tar.gz
+0efc5f6c74a4d7e61ca22683c93c98cf  intel-microcode2ucode.c