diff --git a/mxgrub/mxgrub b/mxgrub/mxgrub
index a86e0673..3b36fa09 100755
--- a/mxgrub/mxgrub
+++ b/mxgrub/mxgrub
@@ -249,7 +249,7 @@ sub update_grub_cfg {
 
 	for my $label (@MARIUX) {
 		my $image=label_to_image($label);
-		$kernellist.="\tmenuentry \"$label\" --unrestricted { save_env chosen ; linux /boot/$image root=LABEL=root $KERNEL_PARAMETER ; initrd /boot/grub/initramfs.igz }\n";
+		$kernellist.="\tmenuentry \"$label\" --unrestricted { save_env chosen ; linux /boot/$image root=LABEL=root $KERNEL_PARAMETER ; initrd /boot/amd-ucode.img /boot/intel-ucode.img /boot/grub/initramfs.igz }\n";
 	}
 
 	my $GRUB_CFG_NEW=<<"EOF";
@@ -267,10 +267,10 @@ insmod all_video
 
 if [ -e /etc/local/USB.usb ]; then
 	set default="mariuxUSB"
-	menuentry "mariuxUSB" --unrestricted { save_env chosen ; linux /boot/bzImage.x86_64 root=LABEL=rootusb rootdelay=5 $KERNEL_PARAMETER ; initrd /boot/grub/initramfs.igz }
+	menuentry "mariuxUSB" --unrestricted { save_env chosen ; linux /boot/bzImage.x86_64 root=LABEL=rootusb rootdelay=5 $KERNEL_PARAMETER ; initrd /boot/amd-ucode.img /boot/intel-ucode.img /boot/grub/initramfs.igz }
 else
 
-menuentry "$MARIUX_DEFAULT" --unrestricted { set chosen="$submenu>$MARIUX_DEFAULT" ; save_env chosen ; linux /boot/bzImage.x86_64 root=LABEL=root $KERNEL_PARAMETER ; initrd /boot/grub/initramfs.igz }
+menuentry "$MARIUX_DEFAULT" --unrestricted { set chosen="$submenu>$MARIUX_DEFAULT" ; save_env chosen ; linux /boot/bzImage.x86_64 root=LABEL=root $KERNEL_PARAMETER ; initrd /boot/amd-ucode.img /boot/intel-ucode.img /boot/grub/initramfs.igz }
 
 submenu "$submenu" --unrestricted {
 $kernellist
@@ -353,7 +353,23 @@ sub cmd_update {
 	update_grub_cfg();
 }
 
+sub build_microcode {
+    my ($pattern, $image, $binname) = @_;
+    sys(<<"EOF");
+set -e
+DSTDIR=kernel/x86/microcode
+mkdir -p /scratch/local/mxgrub-build-microcode/
+cd \$_
+mkdir -p "\$DSTDIR"
+cat $pattern > "\$DSTDIR"/$binname
+find . | cpio -o -H newc > $image
+rm -rf /scratch/local/mxgrub-build-microcode/
+EOF
+}
+
 sub cmd_initramfs {
+	build_microcode('/lib/firmware/amd-ucode/microcode_amd*.bin', '/boot/amd-ucode.img',  'AuthenticAMD.bin');
+	build_microcode('/lib/firmware/intel-ucode/*', '/boot/intel-ucode.img',  'GenuineIntel.bin');
 	sys('bash','-c','cd /project/admin/initramfs ; find . -name ".git*" -prune -or -print | cpio -H newc -o | gzip > /boot/grub/initramfs.igz');
 }