diff --git a/kernel-xenlinux.spec b/kernel-xenlinux.spec
index f2e81c0..9843c55 100644
--- a/kernel-xenlinux.spec
+++ b/kernel-xenlinux.spec
@@ -406,7 +406,9 @@ mkdir /tmp/qubes-modules-%kernelrelease
 truncate -s 200M /tmp/qubes-modules-%kernelrelease.img
 mkfs -t ext3 -F /tmp/qubes-modules-%kernelrelease.img > /dev/null
 mount /tmp/qubes-modules-%kernelrelease.img /tmp/qubes-modules-%kernelrelease -o loop
-cp -a -t /tmp/qubes-modules-%kernelrelease %vm_install_dir/modules/*
+cp -a -t /tmp/qubes-modules-%kernelrelease %vm_install_dir/modules/%kernelrelease
+mkdir /tmp/qubes-modules-%kernelrelease/firmware
+cp -a -t /tmp/qubes-modules-%kernelrelease %vm_install_dir/modules/firmware/%kernelrelease
 umount /tmp/qubes-modules-%kernelrelease
 rmdir /tmp/qubes-modules-%kernelrelease
 mv /tmp/qubes-modules-%kernelrelease.img %vm_install_dir/modules.img