diff --git a/hardware/cpu/intel-ucode/actions.py b/hardware/cpu/intel-ucode/actions.py
index ecba807fe8..8df62a9d7c 100644
--- a/hardware/cpu/intel-ucode/actions.py
+++ b/hardware/cpu/intel-ucode/actions.py
@@ -8,9 +8,12 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
-import os
+
+def build():
+    shelltools.system("rm -f intel-ucode{,-with-caveats}/list")
+    shelltools.system("mkdir -p kernel/x86/microcode")
+    shelltools.system("iucode_tool --write-earlyfw=intel-ucode.img intel-ucode{,-with-caveats}/")
+    shelltools.chmod(get.curDIR() + "/intel-ucode.img", 0644)
 
 def install():
-    pisitools.insinto("/lib/firmware/intel-ucode", "Intel-Linux-Processor-Microcode-Data-Files-microcode-" + get.srcVERSION() + "/intel-ucode/*")
-    pisitools.dodir("usr/lib/dracut/dracut.conf.d")
-    os.system("echo 'early_microcode=yes' >> " + get.installDIR() + "/usr/lib/dracut/dracut.conf.d/intel_ucode.conf")
+    pisitools.insinto("/boot", "intel-ucode.img")
\ No newline at end of file
diff --git a/hardware/cpu/intel-ucode/pspec.xml b/hardware/cpu/intel-ucode/pspec.xml
index 90bd3c24a8..1e70514db8 100644
--- a/hardware/cpu/intel-ucode/pspec.xml
+++ b/hardware/cpu/intel-ucode/pspec.xml
@@ -12,15 +12,17 @@
         <IsA>library</IsA>
         <Summary>Microcode update files for Intel CPUs</Summary>
         <Description>Microcode update files for Intel CPUs</Description>
-        <Archive sha1sum="0ac7bf571c770a29bb878335bf294242ae4ed6ec" type="zip" target="microcode-20210216">https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/refs/tags/microcode-20210216.zip</Archive>
+        <Archive sha1sum="0ac7bf571c770a29bb878335bf294242ae4ed6ec" type="zip">https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/refs/tags/microcode-20210216.zip</Archive>
+        <BuildDependencies>
+            <Dependency>iucode-tool</Dependency>
+        </BuildDependencies>
     </Source>
 
     <Package>
         <Name>intel-ucode</Name>
         <Files>
             <Path fileType="data">/usr/share/doc</Path>
-            <Path fileType="library">/lib/firmware</Path>
-            <Path fileType="library">/usr/lib/dracut</Path>
+            <Path fileType="data">/boot</Path>
         </Files>
         <AdditionalFiles>
             <AdditionalFile target="/usr/share/doc/intel-ucode/LICENSE" owner="root" permission="0644">LICENSE</AdditionalFile>
diff --git a/programming/tool/iucode-tool/actions.py b/programming/tool/iucode-tool/actions.py
new file mode 100644
index 0000000000..ae0018f2fa
--- /dev/null
+++ b/programming/tool/iucode-tool/actions.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import get
+
+def setup():
+    shelltools.system("NOCONFIGURE=1 ./autogen.sh")
+    autotools.configure("--prefix=/usr \
+                         --sbindir=/usr/bin")
+
+def build():
+    autotools.make()
+    
+def install():
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+
+    pisitools.dodoc("AUTHORS", "CONTRIBUTING", "COPYING", "ChangeLog", "INSTALL", "NEWS", "README*")
\ No newline at end of file
diff --git a/programming/tool/iucode-tool/pspec.xml b/programming/tool/iucode-tool/pspec.xml
new file mode 100644
index 0000000000..f4ed292ae3
--- /dev/null
+++ b/programming/tool/iucode-tool/pspec.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>iucode-tool</Name>
+        <Homepage>https://gitlab.com/iucode-tool/iucode-tool</Homepage>
+        <Packager>
+            <Name>Pisi Linux Admins</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>GPLv2</License>
+        <Summary>Tool to manipulate Intel® IA-32/X86-64 microcode bundles</Summary>
+        <Description>Tool to manipulate Intel® IA-32/X86-64 microcode bundles</Description>
+        <Archive sha1sum="36768d306eaba79465bb3d0cb85a2fa5ba3ce2ee" type="targz">https://gitlab.com/iucode-tool/iucode-tool/-/archive/v2.3.1/iucode-tool-v2.3.1.tar.gz</Archive>
+    </Source>
+
+    <Package>
+        <Name>iucode-tool</Name>
+        <Files>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="data">/usr/share</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="1">
+            <Date>2021-05-26</Date>
+            <Version>2.3.1</Version>
+            <Comment>First release</Comment>
+            <Name>Berk Çakar</Name>
+            <Email>berk2238@hotmail.com</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file