diff --git a/netvm.spec b/netvm.spec
index c352982..19c67b2 100644
--- a/netvm.spec
+++ b/netvm.spec
@@ -5,6 +5,8 @@
 
 %{!?version: %define version %(cat version_netvm)}
 
+%define _binaries_in_noarch_packages_terminate_build 0
+
 Name:		qubes-servicevm-%{netvm_name}
 Version:	%{version}
 Release:	1
@@ -40,8 +42,8 @@ sed -e s/%NETVMNAME%/%{netvm_name}/ < vm_conf_files/netvm.conf >\
      $RPM_BUILD_ROOT/%{dest_dir}/%{netvm_name}.conf
 
 mkdir -p $RPM_BUILD_ROOT/%{dest_dir}/kernels
-cp vm_kernels/vmlinuz $RPM_BUILD_ROOT/%{dest_dir}/kernels/vmlinuz
-cp vm_kernels/initramfs $RPM_BUILD_ROOT/%{dest_dir}/kernels/initramfs
+cp vm_kernels_netvm/vmlinuz $RPM_BUILD_ROOT/%{dest_dir}/kernels/vmlinuz
+cp vm_kernels_netvm/initramfs $RPM_BUILD_ROOT/%{dest_dir}/kernels/initramfs
 
 cp vm_initramfs_patches/qubes_cow_setup.sh $RPM_BUILD_ROOT/%{dest_dir}/kernels/qubes_cow_setup.sh
 
diff --git a/templates.spec b/templates.spec
index 3e70fd3..0e1f8a2 100644
--- a/templates.spec
+++ b/templates.spec
@@ -44,8 +44,8 @@ sed -e s/%TEMPLATENAME%/%{template_name}/ < vm_conf_files/templatevm.conf >\
      $RPM_BUILD_ROOT/%{dest_dir}/%{template_name}.conf
 
 mkdir -p $RPM_BUILD_ROOT/%{dest_dir}/kernels
-cp vm_kernels/vmlinuz $RPM_BUILD_ROOT/%{dest_dir}/kernels/vmlinuz
-cp vm_kernels/initramfs $RPM_BUILD_ROOT/%{dest_dir}/kernels/initramfs
+cp vm_kernels_appvm/vmlinuz $RPM_BUILD_ROOT/%{dest_dir}/kernels/vmlinuz
+cp vm_kernels_appvm/initramfs $RPM_BUILD_ROOT/%{dest_dir}/kernels/initramfs
 
 cp vm_initramfs_patches/qubes_cow_setup.sh $RPM_BUILD_ROOT/%{dest_dir}/kernels/qubes_cow_setup.sh
 
diff --git a/vm_kernels_appvm b/vm_kernels_appvm
new file mode 120000
index 0000000..7f82751
--- /dev/null
+++ b/vm_kernels_appvm
@@ -0,0 +1 @@
+vm_kernels_appvm_x64/
\ No newline at end of file
diff --git a/vm_kernels_netvm b/vm_kernels_netvm
new file mode 120000
index 0000000..01414e6
--- /dev/null
+++ b/vm_kernels_netvm
@@ -0,0 +1 @@
+vm_kernels_netvm_x64/
\ No newline at end of file