diff --git a/openafs.spec b/openafs.spec
index 89b37dc..8216af5 100644
--- a/openafs.spec
+++ b/openafs.spec
@@ -129,10 +129,7 @@ Requires(post): %insserv_prereq
 Requires(post): %fillup_prereq
 
 %if %{build_kernel_modules} 
-BuildRequires:  kernel-source
-BuildRequires:  kernel-syms
-BuildRequires:  libelf-devel
-BuildRequires:  module-init-tools
+BuildRequires:  %{kernel_module_package_buildreqs}
 %endif
 
 %description  
@@ -238,9 +235,8 @@ module.
 %package KMP
 Summary:        OpenAFS Distributed File System - kernel module
 Group:          System/Kernel
-Requires:       %{kernel_module_package_buildreqs}
 
-%kernel_module_package -x lockdep um xen pae -p %_sourcedir/preamble -n %%{name}
+%kernel_module_package -x lockdep um pae -p %{S:30}
 
 %description KMP
 This package contains the kernel module for OpenAFS. For details see
@@ -298,7 +294,7 @@ and load balancing, and ACLs. This package contains the OpenAFS client.
 : @@@ sysconf dir:    	  %{_sysconfdir}
 : @@@ man dir:    	  %{_mandir}
 : @@@ build modules:      %{build_kernel_modules}
-: @@@ architecture:               %{_arch}
+: @@@ architecture:       %{_arch}
 : @@@ target cpu:         %{_target_cpu}
 : @@@
 : @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@ -387,7 +383,7 @@ for flavor in %flavors_to_build; do
     pushd obj/$flavor
     ./configure  --with-linux-kernel-build=/usr/src/linux-obj/%{_target_cpu}/$flavor --with-linux-kernel-headers=/usr/src/linux \
         --disable-transarc-paths
-    export LINUX_MAKE_ARCH="ARCH=%{_arch}"
+    export LINUX_MAKE_ARCH=%{?linux_make_arch}
     make
     popd
 done
@@ -457,10 +453,9 @@ install -m 644 LICENSE %{buildroot}/usr/src/kernel-modules/openafs/LICENSE
 %if %{build_kernel_modules}
 export INSTALL_MOD_PATH=%{buildroot}
 export INSTALL_MOD_DIR=updates
-export LINUX_MAKE_ARCH="ARCH=%{_arch}"
 
 for flavor in %flavors_to_build; do
-    make -C /usr/src/linux-obj/%{_arch}/$flavor $LINUX_MAKE_ARCH modules_install \
+    make -C /usr/src/linux-obj/%{_arch}/$flavor %{?linux_make_arch} modules_install \
         M=$PWD/`find obj/$flavor/ -name MODLOAD-\* -type d`
 done
 %endif
diff --git a/preamble b/preamble
index bae1bcb..e9bfbf7 100644
--- a/preamble
+++ b/preamble
@@ -1,4 +1,3 @@
 Requires:  kernel-%1
-Requires:  kernel-syms modutils
 Requires:  %{name}-client = %{version}
 Conflicts: %{name}-fuse-client = %{version}