diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index a5507b85..2a0aeeb6 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -91,7 +91,15 @@ arch/x86/kvm
 %endfor
 remove lib/modules/*/{build,source,*.map}
 ## 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
+## Also keep virtio-rng so that the installer can get sufficient randomness for
+## LUKS setup.
+runcmd chroot ${root} find /lib/modules \
+                        -regex ".*/kernel/drivers/char/.*" \
+                        \! -name virtio_console.ko\* \
+                        \! -name hw_random \
+                        \! -name virtio-rng.ko\* \
+                        \! -name ipmi\* \
+                        -delete
 ## NOTE: depmod gets re-run after cleanup finishes
 
 ## remove unused themes, theme engines, icons, etc.