diff --git a/kernel.spec b/kernel.spec
index 8de44b6..633129a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -564,17 +564,20 @@ find /lib/modules/%{kver_full} -maxdepth 0 -empty -exec rm -rf {} \; || true
 
 
 %files -n kernel-%{flavour}-devel-%{buildrel}
+%{devel_root}/Documentation
 %dir %{devel_root}
 %dir %{devel_root}/arch
 %dir %{devel_root}/include
-%{devel_root}/Documentation
 %{devel_root}/arch/um
-%{devel_root}/arch/%{arch_type}
+%{devel_root}/arch/x86
+%{devel_root}/arch/arm
+%{devel_root}/arch/arm64
 %{devel_root}/block
 %{devel_root}/certs
 %{devel_root}/crypto
 %{devel_root}/drivers
 %{devel_root}/fs
+%{devel_root}/include/soc
 %{devel_root}/include/acpi
 %{devel_root}/include/asm-generic
 %{devel_root}/include/clocksource
@@ -1527,12 +1530,6 @@ for i in alpha arc avr32 blackfin c6x cris csky frv h8300 hexagon ia64 m32r m68k
 	rm -rf %{temp_devel_root}/arch/$i
 done
 
-%ifarch %{ix86} %{x86_64}
-rm -rf %{temp_devel_root}/arch/arm*
-rm -rf %{temp_devel_root}/include/kvm/arm*
-rm -rf %{temp_devel_root}/include/soc
-%endif
-
 # Clean the scripts tree, and make sure everything is ok (sanity check)
 # running prepare+scripts (tree was already "prepared" in build)
 pushd %{temp_devel_root}