diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 97aea7fb..d06c2231 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -90,8 +90,8 @@ arch/x86/kvm
     remove lib/modules/*/kernel/${kmodpath}
 %endfor
 remove lib/modules/*/{build,source,*.map}
-## Need to keep virtio_console.ko in drivers/char
-runcmd chroot ${root} find /lib/modules -regex ".*/kernel/drivers/char/.*" \! -name virtio_console.ko -delete
+## Need to keep virtio_console.ko and ipmi stuff in drivers/char
+runcmd chroot ${root} find /lib/modules -regex ".*/kernel/drivers/char/.*" \! -name virtio_console.ko\* \! -name ipmi* -delete
 ## NOTE: depmod gets re-run after cleanup finishes
 
 ## remove unused themes, theme engines, icons, etc.
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 47596169..7e295f0d 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -95,7 +95,7 @@ installpkg tigervnc-server-module
 installpkg net-tools
 
 ## hardware utilities/libraries
-installpkg pciutils usbutils
+installpkg pciutils usbutils ipmitool
 installpkg mt-st smartmontools
 %if basearch != "s390x":
 installpkg hdparm