Index: server/fedora/Makefile
===================================================================
--- server/fedora/Makefile	(revision 437)
+++ server/fedora/Makefile	(revision 507)
@@ -38,6 +38,4 @@
 server_url	= "http://web.mit.edu/scripts/src"
 server_arch	= "fedora.stable"
-
-openafs_rpm_args = -E "%define kernvers $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)"
 
 .PHONY: minimal-clean
@@ -118,9 +116,13 @@
 $(allsrc): setup
 	PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
-	rpmbuild -ba ${tmp_specs}/$@*.spec
+	rpmbuild $(rpmbuild_args) -ba ${tmp_specs}/$@*.spec
 
 openafs-kernel: setup
 	PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
-	rpmbuild $(openafs_rpm_args) -bb --define "build_userspace 0" --define "build_modules 1" ${tmp_specs}/openafs*.spec
+	rpmbuild $(rpmbuild_args) -bb ${tmp_specs}/openafs*.spec
+
+openafs_rpmbuild_args = --define "fedorakmod 1" --define "kvariants ''" --define "kernvers $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)"
+openafs: rpmbuild_args += $(openafs_rpmbuild_args)
+openafs-kernel: rpmbuild_args += $(openafs_rpmbuild_args) --define "build_userspace 0" --define "build_modules 1"
 
 suexec: install-srpms